diff options
| author | Jose <jose@zeroc.com> | 2020-11-30 18:42:15 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2020-11-30 18:42:15 +0100 |
| commit | 0c80e767f0650386d26f16b044c55d76c8eab894 (patch) | |
| tree | 3445d6355e2c2733f0fdac9309eb62c1efdbfabf /cpp | |
| parent | Swift build fixes for Xcode 12 and macOS 11 (diff) | |
| download | ice-0c80e767f0650386d26f16b044c55d76c8eab894.tar.bz2 ice-0c80e767f0650386d26f16b044c55d76c8eab894.tar.xz ice-0c80e767f0650386d26f16b044c55d76c8eab894.zip | |
Update version to 3.7.5
Diffstat (limited to 'cpp')
608 files changed, 6752 insertions, 6752 deletions
diff --git a/cpp/README.md b/cpp/README.md index 054f7dc0a54..6083c19d54d 100644 --- a/cpp/README.md +++ b/cpp/README.md @@ -541,7 +541,7 @@ If everything worked out, you should see lots of `ok` messages. In case of a failure, the tests abort with `failed`. [1]: https://zeroc.com/downloads/ice -[2]: https://doc.zeroc.com/ice/3.7/release-notes/supported-platforms-for-ice-3-7-4 +[2]: https://doc.zeroc.com/ice/3.7/release-notes/supported-platforms-for-ice-3-7-5 [3]: https://github.com/zeroc-ice/bzip2 [4]: https://libexpat.github.io [5]: https://symas.com/lightning-memory-mapped-database/ diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 45e606641a8..d2be206e313 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -283,8 +283,8 @@ // // The Ice version. // -#define ICE_STRING_VERSION "3.7.4" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30704 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.7.5" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30705 // AABBCC, with AA=major, BB=minor, CC=patch #define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch #if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS) diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h index f3a74fbecec..49c1f79c9c5 100644 --- a/cpp/include/IceUtil/ResourceConfig.h +++ b/cpp/include/IceUtil/ResourceConfig.h @@ -7,8 +7,8 @@ #include "winver.h" -#define ICE_VERSION 3,7,4,0 -#define ICE_STRING_VERSION "3.7.4\0" +#define ICE_VERSION 3,7,5,0 +#define ICE_STRING_VERSION "3.7.5\0" #define ICE_SO_VERSION "37\0" #define ICE_COMPANY_NAME "ZeroC, Inc.\0" #define ICE_COPYRIGHT "\251 ZeroC, Inc.\0" diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.nuspec index da512bffd87..75734a34393 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v140.nuspec +++ b/cpp/msbuild/zeroc.ice.uwp.v140.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.uwp.v140</id> <title>ZeroC Ice for UWP and Visual Studio 2015</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,11 +11,11 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice C++/CX SDK for Visual Studio 2015 (v140). Provides binaries for Universal Windows (UWP) x86 and x64. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc uwp v140 zeroc</tags> <dependencies> - <dependency id="zeroc.ice.uwp.v140.x86" version="[3.7.4]"/> - <dependency id="zeroc.ice.uwp.v140.x64" version="[3.7.4]"/> + <dependency id="zeroc.ice.uwp.v140.x86" version="[3.7.5]"/> + <dependency id="zeroc.ice.uwp.v140.x64" version="[3.7.5]"/> </dependencies> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.props b/cpp/msbuild/zeroc.ice.uwp.v140.props index f2f11d4689e..0fd05e1ae75 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v140.props +++ b/cpp/msbuild/zeroc.ice.uwp.v140.props @@ -2,11 +2,11 @@ <!-- Copyright (c) ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '14.0'"> - <IceVersion>3.7.4</IceVersion> - <IceIntVersion>30704</IceIntVersion> + <IceVersion>3.7.5</IceVersion> + <IceIntVersion>30705</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37</IceSoVersion> - <IceNugetPackageVersion>3.7.4</IceNugetPackageVersion> + <IceNugetPackageVersion>3.7.5</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> </PropertyGroup> diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec index ef8b6955f42..4a78c67c7d0 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec +++ b/cpp/msbuild/zeroc.ice.uwp.v140.x64.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.uwp.v140.x64</id> <title>ZeroC Ice for UWP and Visual Studio 2015</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>x64 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v140.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc uwp v140 x64 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec b/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec index 7128c43f021..a877448dd07 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec +++ b/cpp/msbuild/zeroc.ice.uwp.v140.x86.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.uwp.v140.x86</id> <title>ZeroC Ice for UWP and Visual Studio 2015</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>x86 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v140.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc uwp v140 x86 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.nuspec index 37b13d1299e..2289c1663f4 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v141.nuspec +++ b/cpp/msbuild/zeroc.ice.uwp.v141.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.uwp.v141</id> <title>ZeroC Ice for UWP and Visual Studio 2017</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,11 +11,11 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice C++/CX SDK for Visual Studio 2017 (v141). Provides binaries for Universal Windows (UWP) x86 and x64. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc uwp v141 zeroc</tags> <dependencies> - <dependency id="zeroc.ice.uwp.v141.x86" version="[3.7.4]"/> - <dependency id="zeroc.ice.uwp.v141.x64" version="[3.7.4]"/> + <dependency id="zeroc.ice.uwp.v141.x86" version="[3.7.5]"/> + <dependency id="zeroc.ice.uwp.v141.x64" version="[3.7.5]"/> </dependencies> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.props b/cpp/msbuild/zeroc.ice.uwp.v141.props index 019dbb4c663..cbfc90ff3bf 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v141.props +++ b/cpp/msbuild/zeroc.ice.uwp.v141.props @@ -2,11 +2,11 @@ <!-- Copyright (c) ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '15.0'"> - <IceVersion>3.7.4</IceVersion> - <IceIntVersion>30704</IceIntVersion> + <IceVersion>3.7.5</IceVersion> + <IceIntVersion>30705</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37</IceSoVersion> - <IceNugetPackageVersion>3.7.4</IceNugetPackageVersion> + <IceNugetPackageVersion>3.7.5</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> </PropertyGroup> diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec index 9940d2dfcc1..b169cdc2fd8 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec +++ b/cpp/msbuild/zeroc.ice.uwp.v141.x64.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.uwp.v141.x64</id> <title>ZeroC Ice for UWP and Visual Studio 2017</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>x64 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v141.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc uwp v141 x64 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec b/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec index 481003b7963..63168c8bcc0 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec +++ b/cpp/msbuild/zeroc.ice.uwp.v141.x86.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.uwp.v141.x86</id> <title>ZeroC Ice for UWP and Visual Studio 2017</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>x86 subset of the Ice C++/CX SDK. Installed by zeroc.ice.uwp.v141.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc uwp v141 x86 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.v100.nuspec b/cpp/msbuild/zeroc.ice.v100.nuspec index 4ff63bcf583..52e32c88183 100644 --- a/cpp/msbuild/zeroc.ice.v100.nuspec +++ b/cpp/msbuild/zeroc.ice.v100.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.v100</id> <title>ZeroC Ice C++ for Visual Studio 2010</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice C++ SDK for Visual Studio 2010 (v100). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc v100 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.v100.props b/cpp/msbuild/zeroc.ice.v100.props index 7fd1927aeaa..c86a81bac94 100644 --- a/cpp/msbuild/zeroc.ice.v100.props +++ b/cpp/msbuild/zeroc.ice.v100.props @@ -2,11 +2,11 @@ <!-- Copyright (c) ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0'"> - <IceVersion>3.7.4</IceVersion> - <IceIntVersion>30704</IceIntVersion> + <IceVersion>3.7.5</IceVersion> + <IceIntVersion>30705</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37</IceSoVersion> - <IceNugetPackageVersion>3.7.4</IceNugetPackageVersion> + <IceNugetPackageVersion>3.7.5</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> </PropertyGroup> diff --git a/cpp/msbuild/zeroc.ice.v120.nuspec b/cpp/msbuild/zeroc.ice.v120.nuspec index 41633fc6be2..c5a25cb7b20 100644 --- a/cpp/msbuild/zeroc.ice.v120.nuspec +++ b/cpp/msbuild/zeroc.ice.v120.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.v120</id> <title>ZeroC Ice C++ for Visual Studio 2013</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice C++ SDK for Visual Studio 2013 (v120). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc v120 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.v120.props b/cpp/msbuild/zeroc.ice.v120.props index 6a52c2e0399..30a1f31fba3 100644 --- a/cpp/msbuild/zeroc.ice.v120.props +++ b/cpp/msbuild/zeroc.ice.v120.props @@ -2,11 +2,11 @@ <!-- Copyright (c) ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'"> - <IceVersion>3.7.4</IceVersion> - <IceIntVersion>30704</IceIntVersion> + <IceVersion>3.7.5</IceVersion> + <IceIntVersion>30705</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37</IceSoVersion> - <IceNugetPackageVersion>3.7.4</IceNugetPackageVersion> + <IceNugetPackageVersion>3.7.5</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> </PropertyGroup> diff --git a/cpp/msbuild/zeroc.ice.v140.nuspec b/cpp/msbuild/zeroc.ice.v140.nuspec index d053922eb6a..1c5cfc794e5 100644 --- a/cpp/msbuild/zeroc.ice.v140.nuspec +++ b/cpp/msbuild/zeroc.ice.v140.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.v140</id> <title>ZeroC Ice C++ for Visual Studio 2015</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice C++ SDK for Visual Studio 2015 (v140). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc v140 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.v140.props b/cpp/msbuild/zeroc.ice.v140.props index a3c81f64c83..92e9d6885bb 100644 --- a/cpp/msbuild/zeroc.ice.v140.props +++ b/cpp/msbuild/zeroc.ice.v140.props @@ -2,11 +2,11 @@ <!-- Copyright (c) ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'"> - <IceVersion>3.7.4</IceVersion> - <IceIntVersion>30704</IceIntVersion> + <IceVersion>3.7.5</IceVersion> + <IceIntVersion>30705</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37</IceSoVersion> - <IceNugetPackageVersion>3.7.4</IceNugetPackageVersion> + <IceNugetPackageVersion>3.7.5</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> </PropertyGroup> diff --git a/cpp/msbuild/zeroc.ice.v141.nuspec b/cpp/msbuild/zeroc.ice.v141.nuspec index 0c0742a22df..e0b8fe43ed4 100644 --- a/cpp/msbuild/zeroc.ice.v141.nuspec +++ b/cpp/msbuild/zeroc.ice.v141.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.v141</id> <title>ZeroC Ice C++ for Visual Studio 2017</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice C++ SDK for Visual Studio 2017 (v141). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc v141 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.v141.props b/cpp/msbuild/zeroc.ice.v141.props index 864a33d91c3..ffca11b3076 100644 --- a/cpp/msbuild/zeroc.ice.v141.props +++ b/cpp/msbuild/zeroc.ice.v141.props @@ -2,11 +2,11 @@ <!-- Copyright (c) ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'"> - <IceVersion>3.7.4</IceVersion> - <IceIntVersion>30704</IceIntVersion> + <IceVersion>3.7.5</IceVersion> + <IceIntVersion>30705</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37</IceSoVersion> - <IceNugetPackageVersion>3.7.4</IceNugetPackageVersion> + <IceNugetPackageVersion>3.7.5</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> </PropertyGroup> diff --git a/cpp/msbuild/zeroc.ice.v142.nuspec b/cpp/msbuild/zeroc.ice.v142.nuspec index 1e5d7575e0f..6e417db066b 100644 --- a/cpp/msbuild/zeroc.ice.v142.nuspec +++ b/cpp/msbuild/zeroc.ice.v142.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.v142</id> <title>ZeroC Ice C++ for Visual Studio 2019</title> - <version>3.7.4</version> + <version>3.7.5</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <icon>logo.png</icon> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice C++ SDK for Visual Studio 2019 (v142). Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.4+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/rel/ice-releases/ice-3-7/ice-3-7-5-release-notes</releaseNotes> <tags>ice native rpc v141 zeroc</tags> </metadata> </package> diff --git a/cpp/msbuild/zeroc.ice.v142.props b/cpp/msbuild/zeroc.ice.v142.props index 0abafc2b0c4..2d0c07fa6eb 100644 --- a/cpp/msbuild/zeroc.ice.v142.props +++ b/cpp/msbuild/zeroc.ice.v142.props @@ -2,11 +2,11 @@ <!-- Copyright (c) ZeroC, Inc. All rights reserved. --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(VisualStudioVersion)' == '16.0'"> - <IceVersion>3.7.4</IceVersion> - <IceIntVersion>30704</IceIntVersion> + <IceVersion>3.7.5</IceVersion> + <IceIntVersion>30705</IceIntVersion> <IceVersionMM>3.7</IceVersionMM> <IceSoVersion>37</IceSoVersion> - <IceNugetPackageVersion>3.7.4</IceNugetPackageVersion> + <IceNugetPackageVersion>3.7.5</IceNugetPackageVersion> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> <IceToolsPath>$(IceHome)\tools</IceToolsPath> </PropertyGroup> diff --git a/cpp/test/Common/msbuild/packages.config b/cpp/test/Common/msbuild/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Common/msbuild/packages.config +++ b/cpp/test/Common/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj index 9de23c632a7..9f9820b9538 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -177,28 +177,28 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 dd4bbcef409..747264466f0 100644 --- a/cpp/test/Common/msbuild/uwp/packages.config +++ b/cpp/test/Common/msbuild/uwp/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj index 3a3e8981831..694d7f48c29 100644 --- a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj +++ b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -156,15 +156,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj index 22602fc0088..b7e487977fb 100644 --- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/application/msbuild/client/packages.config +++ b/cpp/test/Glacier2/application/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/server/packages.config b/cpp/test/Glacier2/application/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/application/msbuild/server/packages.config +++ b/cpp/test/Glacier2/application/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj index 1e875e313fe..5d850d2dec3 100644 --- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 aeb92cb23a1..8f6f78040f4 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -337,15 +337,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/server/packages.config b/cpp/test/Glacier2/attack/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj index 71ee3d99f35..de0a8374120 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 d45af2e791f..672b19318cc 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj index 87ab5f12f9c..70c9f0bd370 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,15 +342,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 ad5ab1ca6e6..a499bb38f2b 100644 --- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -259,11 +259,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/override/msbuild/client/packages.config +++ b/cpp/test/Glacier2/override/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/server/packages.config b/cpp/test/Glacier2/override/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/override/msbuild/server/packages.config +++ b/cpp/test/Glacier2/override/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj index 25e44564c18..9093e0227e8 100644 --- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 28f2e14689c..dc138f2d4c2 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -259,11 +259,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/router/msbuild/client/packages.config +++ b/cpp/test/Glacier2/router/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/server/packages.config b/cpp/test/Glacier2/router/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/router/msbuild/server/packages.config +++ b/cpp/test/Glacier2/router/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj index 366dd1625cb..aca3571184f 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 4d47931ef30..b5328652609 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj index 00dd77112b9..5fd9dfcf733 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 54e063a2ff3..aac7a45d0f4 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config b/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj index b7546361eb2..fca77b7f092 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 b2f6221a691..cf2461c1be2 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/ssl/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.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -91,10 +91,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 de72e3ebfd2..2750f8b6972 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/packages.config +++ b/cpp/test/Glacier2/ssl/msbuild/client/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 de72e3ebfd2..2750f8b6972 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/packages.config +++ b/cpp/test/Glacier2/ssl/msbuild/server/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 e7aeafa9958..f8ec00e4236 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/ssl/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.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -85,10 +85,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 1f0e3d02993..b1a29e3aac5 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -258,11 +258,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -337,15 +337,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj index 13428109974..bcc33696016 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 16c37343483..a6afa44d10d 100644 --- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -326,17 +326,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/client/packages.config b/cpp/test/Ice/acm/msbuild/client/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/acm/msbuild/client/packages.config +++ b/cpp/test/Ice/acm/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/server/packages.config b/cpp/test/Ice/acm/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/acm/msbuild/server/packages.config +++ b/cpp/test/Ice/acm/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/server/server.vcxproj index c7a3a8be9cb..4fef95e666a 100644 --- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 cda5016f82e..89bfeabeaf8 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/acm/msbuild/uwp/client/packages.config b/cpp/test/Ice/acm/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/acm/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/packages.config b/cpp/test/Ice/acm/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/acm/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj index d8ae6b47b7d..4cb1cca1260 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj index bc380408a34..f4cb0f0266b 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj index 9b935a71bf4..01e839685f7 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -346,17 +346,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj index 8a009beb64b..e1fba3f1fff 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -345,17 +345,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 3340079d6b0..3069791eed4 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj index 4c87500d5c8..420d836a93b 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -269,16 +269,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj index 426ed46d160..7838f3334d8 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -273,16 +273,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj index e65ac3e73ce..70d7e59688c 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/admin/msbuild/client/packages.config +++ b/cpp/test/Ice/admin/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/server/packages.config b/cpp/test/Ice/admin/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/admin/msbuild/server/packages.config +++ b/cpp/test/Ice/admin/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/server/server.vcxproj index 6cc659cae31..09ef7bb40e5 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 bd7c07c776e..8d333469fd1 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/admin/msbuild/uwp/client/packages.config b/cpp/test/Ice/admin/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/admin/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/uwp/server/packages.config b/cpp/test/Ice/admin/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/admin/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj index eb24275908a..90eaa5e4905 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj index 75b80bd92d8..112cfc4acb7 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/ami/msbuild/client/packages.config +++ b/cpp/test/Ice/ami/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj index 7186e34164d..ff051131f51 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/packages.config +++ b/cpp/test/Ice/ami/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/server/packages.config b/cpp/test/Ice/ami/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/ami/msbuild/server/packages.config +++ b/cpp/test/Ice/ami/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/server/server.vcxproj index 6a252bc9df0..d0b54a5896a 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 322ff4545d0..82eddcb709c 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/ami/msbuild/uwp/client/packages.config b/cpp/test/Ice/ami/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/ami/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj index e92ad9cd5c7..5452c27527d 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/ami/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/server/packages.config b/cpp/test/Ice/ami/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/ami/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj index 61426ea1a63..590b472a9f4 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj b/cpp/test/Ice/background/msbuild/client/client.vcxproj index 2730eafd1c6..56c16229f75 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -199,15 +199,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/background/msbuild/client/packages.config +++ b/cpp/test/Ice/background/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/background/msbuild/server/packages.config +++ b/cpp/test/Ice/background/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 b5b27dbc562..e069d7969e3 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -200,15 +200,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/packages.config +++ b/cpp/test/Ice/background/msbuild/testtransport/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj index 344d1ee4343..c63e405e6dd 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,17 +362,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 a5295efbda3..0f7fe35e557 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/binding/msbuild/client/packages.config +++ b/cpp/test/Ice/binding/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/server/packages.config b/cpp/test/Ice/binding/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/binding/msbuild/server/packages.config +++ b/cpp/test/Ice/binding/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/server/server.vcxproj index c745578e27c..a98765b3eca 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 2fba0bd967e..b81b815a233 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/binding/msbuild/uwp/client/packages.config b/cpp/test/Ice/binding/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/binding/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/uwp/server/packages.config b/cpp/test/Ice/binding/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/binding/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj index 591e7dfd057..f7370a1b314 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj index 0a6d90af7ca..5aa00514142 100644 --- a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -505,17 +505,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/checksum/msbuild/client/packages.config +++ b/cpp/test/Ice/checksum/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/server/packages.config b/cpp/test/Ice/checksum/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/checksum/msbuild/server/packages.config +++ b/cpp/test/Ice/checksum/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj index ce8e964ced0..dde436d1aad 100644 --- a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -506,17 +506,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 75537ca86f8..7407091fc07 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -334,16 +334,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config b/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config b/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj index 8927b248009..1f5f1b2cfb5 100644 --- a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -370,16 +370,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj index 71ce4cdf700..357efd1671d 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -507,17 +507,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/custom/msbuild/client/packages.config +++ b/cpp/test/Ice/custom/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj index 1e208da0c41..b9e139ba0ad 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -511,17 +511,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/packages.config +++ b/cpp/test/Ice/custom/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/server/packages.config b/cpp/test/Ice/custom/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/custom/msbuild/server/packages.config +++ b/cpp/test/Ice/custom/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/server/server.vcxproj index ab9bc83796c..326d53e14c1 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -510,17 +510,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/custom/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj index 57e19685edb..5f87a0d54be 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -510,17 +510,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 d22c90f3d9a..a63ffb18a4b 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -366,16 +366,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/custom/msbuild/uwp/client/packages.config b/cpp/test/Ice/custom/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj index 750b1c10493..73c12e5d003 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -370,16 +370,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/server/packages.config b/cpp/test/Ice/custom/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj index 0084ed00d70..76d390f0cc2 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -374,15 +374,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/custom/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj index 98c35a654ae..c3aeb8a1c34 100644 --- a/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -381,16 +381,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj index ddb7a6cb081..b29194116df 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/defaultServant/msbuild/packages.config +++ b/cpp/test/Ice/defaultServant/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj index ea9360fad3f..53b3e513e69 100644 --- a/cpp/test/Ice/defaultServant/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config b/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/defaultServant/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj index 26cb92f6354..c759ede8e7e 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/defaultValue/msbuild/packages.config +++ b/cpp/test/Ice/defaultValue/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj index 026006df1c5..b6fbd583fa1 100644 --- a/cpp/test/Ice/defaultValue/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config b/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/defaultValue/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj index 409e6dfec58..4bd86321178 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj index 1a736b444fe..d2ac34770b6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -346,17 +346,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/server/packages.config b/cpp/test/Ice/dispatcher/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj index 5c78ab2a337..15950731443 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -345,17 +345,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 2f40b1fe41d..7ef189977e4 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config b/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj index a81618ccd22..59343ceaa28 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -269,16 +269,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config b/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj index d0283d8cbe0..9b6090e3d22 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -273,16 +273,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/echo/msbuild/packages.config b/cpp/test/Ice/echo/msbuild/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/echo/msbuild/packages.config +++ b/cpp/test/Ice/echo/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj b/cpp/test/Ice/echo/msbuild/server.vcxproj index 4c469c18b2b..985a9c76c1d 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj +++ b/cpp/test/Ice/echo/msbuild/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0e063a92492..e6e0c002aa4 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/enums/msbuild/client/packages.config +++ b/cpp/test/Ice/enums/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/server/packages.config b/cpp/test/Ice/enums/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/enums/msbuild/server/packages.config +++ b/cpp/test/Ice/enums/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/server/server.vcxproj index 37fed3b7ab8..6b2cacfb23d 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 30ac2c0c017..d53eff35ade 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/enums/msbuild/uwp/client/packages.config b/cpp/test/Ice/enums/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/enums/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/uwp/server/packages.config b/cpp/test/Ice/enums/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/enums/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj index a9cfafdd3e9..e3ea543d699 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj index e50006c7ede..55e901d6e4e 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -303,17 +303,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj index cabfc07c6dd..385d2c2fe30 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -345,17 +345,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/server/packages.config b/cpp/test/Ice/exceptions/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj index c04bf4a3ed7..390946623ad 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj index 226247de821..ce0a09f3ada 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -352,17 +352,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 772e9954682..678ed13723e 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -236,16 +236,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj index 6733c7ea8aa..7b2e0a7d83b 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -268,16 +268,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj index d43182e753c..9763b20622f 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj index 6c21fd798f9..b4bd7ae7016 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -273,16 +273,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj index bd68aed7ecc..46df65af06b 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/facets/msbuild/client/packages.config +++ b/cpp/test/Ice/facets/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj index 82653aa632d..d22174ef451 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/packages.config +++ b/cpp/test/Ice/facets/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/server/packages.config b/cpp/test/Ice/facets/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/facets/msbuild/server/packages.config +++ b/cpp/test/Ice/facets/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/server/server.vcxproj index 87a6dc0d31b..27c9019d72e 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 67eadf9a019..5870ee0b6d2 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/facets/msbuild/uwp/client/packages.config b/cpp/test/Ice/facets/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/facets/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj index 48743d8b06a..36d38965c83 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/facets/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/server/packages.config b/cpp/test/Ice/facets/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/facets/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj index 4aba6bb4013..5134f15b97a 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj index 10d4e05e53c..e799f0d897c 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/packages.config b/cpp/test/Ice/faultTolerance/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj index b4364fc2758..638d11eb5fd 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 10ff8e4c894..5bd53c50b03 100644 --- a/cpp/test/Ice/gc/msbuild/client.vcxproj +++ b/cpp/test/Ice/gc/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -341,17 +341,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/gc/msbuild/packages.config +++ b/cpp/test/Ice/gc/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/client.vcxproj b/cpp/test/Ice/hash/msbuild/client.vcxproj index 10e8d7b4389..b8f84aa6d96 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -341,17 +341,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/hash/msbuild/packages.config +++ b/cpp/test/Ice/hash/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj index 391814430bb..94a0216f7c2 100644 --- a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -264,16 +264,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/hash/msbuild/uwp/packages.config b/cpp/test/Ice/hash/msbuild/uwp/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/hash/msbuild/uwp/packages.config +++ b/cpp/test/Ice/hash/msbuild/uwp/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/client/client.vcxproj index 533062344fd..fb2fc3d90b4 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/hold/msbuild/client/packages.config +++ b/cpp/test/Ice/hold/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/server/packages.config b/cpp/test/Ice/hold/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/hold/msbuild/server/packages.config +++ b/cpp/test/Ice/hold/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/server/server.vcxproj index b1b71f80614..12f773a1f67 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 b41cebf150c..5344b5edc2a 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/hold/msbuild/uwp/client/packages.config b/cpp/test/Ice/hold/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/hold/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/uwp/server/packages.config b/cpp/test/Ice/hold/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/hold/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj index c5f3456b46b..6607ecd111d 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/impl/msbuild/server/packages.config b/cpp/test/Ice/impl/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/impl/msbuild/server/packages.config +++ b/cpp/test/Ice/impl/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj b/cpp/test/Ice/impl/msbuild/server/server.vcxproj index c01ff285b91..735c9aa6eb8 100644 --- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -92,12 +92,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -482,17 +482,17 @@ $(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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/impl/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj index 3a35e917f42..b50810109e4 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -92,12 +92,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -480,17 +480,17 @@ $(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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 92c5133b7f1..241e729e6fe 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/info/msbuild/client/packages.config +++ b/cpp/test/Ice/info/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/server/packages.config b/cpp/test/Ice/info/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/info/msbuild/server/packages.config +++ b/cpp/test/Ice/info/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/server/server.vcxproj b/cpp/test/Ice/info/msbuild/server/server.vcxproj index 014c62345a9..99b9e58cd8f 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 3372c3f4d9a..7575f99759e 100644 --- a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/info/msbuild/uwp/client/packages.config b/cpp/test/Ice/info/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/info/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/info/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/uwp/server/packages.config b/cpp/test/Ice/info/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/info/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/info/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj index 888c8656d72..b3113fcd981 100644 --- a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj index d8f13bd5e77..afda4a85500 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj index dd2ebecb975..5301c94cda9 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/server/packages.config b/cpp/test/Ice/inheritance/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj index 577cb2fd284..fe9997f8415 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 ef76eb2d82d..9bd1ac4f4b1 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config b/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj index 3a436512379..036b50134df 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config b/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj index 10d213d791c..fa09669f40d 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj index a12618f851c..86be4128afd 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -211,15 +211,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 002dbed5dfc..525f1031eb6 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -349,17 +349,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj index 4d5dc5f4eaf..e3a24c28765 100644 --- a/cpp/test/Ice/interceptor/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config b/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj index b2394b76a6b..a2deae7b5ba 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/invoke/msbuild/client/packages.config +++ b/cpp/test/Ice/invoke/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/server/packages.config b/cpp/test/Ice/invoke/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/invoke/msbuild/server/packages.config +++ b/cpp/test/Ice/invoke/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj index 520753853b3..704938517f2 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 55700c33fea..e45fb60a0bd 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config b/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/invoke/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config b/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/invoke/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj index 8fe4139f1f4..b98c1a6280c 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj index 7e93a23626e..6c52f674264 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -204,15 +204,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/library/msbuild/alltests/packages.config +++ b/cpp/test/Ice/library/msbuild/alltests/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 be42e0038fc..f002e3af934 100644 --- a/cpp/test/Ice/library/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/library/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -172,15 +172,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/library/msbuild/client/packages.config +++ b/cpp/test/Ice/library/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 bb6e2b8a79d..a0c2bf00d4d 100644 --- a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj +++ b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -204,15 +204,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/library/msbuild/consumer/packages.config +++ b/cpp/test/Ice/library/msbuild/consumer/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 8091bae33a1..93a59e16e92 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -308,17 +308,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/library/msbuild/gencode/packages.config +++ b/cpp/test/Ice/library/msbuild/gencode/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/client/client.vcxproj b/cpp/test/Ice/location/msbuild/client/client.vcxproj index 97e1f4568a0..781de118359 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/location/msbuild/client/packages.config +++ b/cpp/test/Ice/location/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/server/packages.config b/cpp/test/Ice/location/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/location/msbuild/server/packages.config +++ b/cpp/test/Ice/location/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/server/server.vcxproj b/cpp/test/Ice/location/msbuild/server/server.vcxproj index 6455299bf6f..8dea90cabe0 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -345,17 +345,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 a288af670a8..05f166a76b6 100644 --- a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/location/msbuild/uwp/client/packages.config b/cpp/test/Ice/location/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/location/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/location/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/uwp/server/packages.config b/cpp/test/Ice/location/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/location/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/location/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj index 277c68a6d0b..a4e689a67e1 100644 --- a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -273,16 +273,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj index 1abb29237cd..d5abc3727f2 100644 --- a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,11 +95,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/logger/msbuild/client1/packages.config +++ b/cpp/test/Ice/logger/msbuild/client1/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 28b604ae741..b7bbff66978 100644 --- a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,11 +95,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/logger/msbuild/client2/packages.config +++ b/cpp/test/Ice/logger/msbuild/client2/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 fa606899cd8..9137fbc0ca9 100644 --- a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,11 +95,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/logger/msbuild/client3/packages.config +++ b/cpp/test/Ice/logger/msbuild/client3/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 3fcc3f71722..1fc8eee9fa2 100644 --- a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,11 +95,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/logger/msbuild/client4/packages.config +++ b/cpp/test/Ice/logger/msbuild/client4/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 add6ed35d9c..a5bf989dc6e 100644 --- a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,11 +95,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/logger/msbuild/client5/packages.config +++ b/cpp/test/Ice/logger/msbuild/client5/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 cafc24cc3f7..e05060e4de9 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -347,17 +347,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/metrics/msbuild/client/packages.config +++ b/cpp/test/Ice/metrics/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj index c4befaf60ad..f940f56f0bf 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -349,17 +349,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/packages.config +++ b/cpp/test/Ice/metrics/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/server/packages.config b/cpp/test/Ice/metrics/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/metrics/msbuild/server/packages.config +++ b/cpp/test/Ice/metrics/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj index e5ba10d0438..cdd514f7885 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/metrics/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj index f37645913cf..493f8573192 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 ae790e11789..fb727513df5 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj index 2f946f1ae60..99b71a48aa8 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -269,16 +269,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj index aa56be6501a..2e3239912f0 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj index f570d59ede0..a8892447f16 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -266,16 +266,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj index f92756e4836..777ea843870 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -262,12 +262,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/server/packages.config b/cpp/test/Ice/networkProxy/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj index cbe3a19f835..8aeb9df9514 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -261,12 +261,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -341,17 +341,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 2e33b2992a5..1867fb0e77a 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config b/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config b/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj index 5fbb8a88c71..5961b1edc26 100644 --- a/cpp/test/Ice/networkProxy/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -269,16 +269,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/client/client.vcxproj index 207463d968f..0167d5e0198 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -869,17 +869,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/objects/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj index 4e4dcaa6397..5ea14170dd1 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -862,17 +862,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/packages.config +++ b/cpp/test/Ice/objects/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/packages.config b/cpp/test/Ice/objects/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/objects/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/server/server.vcxproj index 605ed6a8092..20bf95c3799 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -861,17 +861,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5befc40505c..e0ca2c04601 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -560,16 +560,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/objects/msbuild/uwp/client/packages.config b/cpp/test/Ice/objects/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/objects/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj index 4b9e58d9e62..e66d84d4c72 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -561,16 +561,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/objects/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/server/packages.config b/cpp/test/Ice/objects/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/objects/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj index c4fab6f2649..6b246881b4e 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -565,16 +565,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index c14ee563011..922be6ccf37 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -348,17 +348,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/operations/msbuild/client/packages.config +++ b/cpp/test/Ice/operations/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj index 809e668f0c2..1d6276567a6 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -358,17 +358,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/packages.config +++ b/cpp/test/Ice/operations/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/server/packages.config b/cpp/test/Ice/operations/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/operations/msbuild/server/packages.config +++ b/cpp/test/Ice/operations/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj index 1111ab6ae5c..bbd3b3ee844 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -351,17 +351,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/operations/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj index 9ce68c67953..6bcd1f21bd7 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -351,17 +351,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 ec1ba78be0f..bda52c445f7 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/operations/msbuild/uwp/client/packages.config b/cpp/test/Ice/operations/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj index d1bc847ba6c..60885e6f5bd 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -279,16 +279,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/packages.config b/cpp/test/Ice/operations/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj index 5f10277ed93..6a5de351bf4 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -277,16 +277,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/operations/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj index 5a6e57d8bf3..d254e0cd7ce 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -278,16 +278,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/client/client.vcxproj index afa6068a7ac..ed1b1defa07 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -347,17 +347,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/optional/msbuild/client/packages.config +++ b/cpp/test/Ice/optional/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/server/packages.config b/cpp/test/Ice/optional/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/optional/msbuild/server/packages.config +++ b/cpp/test/Ice/optional/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/server/server.vcxproj index affe18ed64c..196c89f3a9e 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -347,17 +347,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/optional/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj index 8d54bb6c649..a124b3ea271 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -347,17 +347,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 091724dc6bc..7c5fea17bd9 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,15 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/optional/msbuild/uwp/client/packages.config b/cpp/test/Ice/optional/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/optional/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/uwp/server/packages.config b/cpp/test/Ice/optional/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/optional/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj index e2c6411de15..995ef527ffd 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -277,15 +277,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/optional/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj index fee93b7a3df..28c38520c02 100644 --- a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -278,15 +278,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj index acee2969561..affd1136990 100644 --- a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,11 +95,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -136,15 +136,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/plugin/msbuild/client/packages.config +++ b/cpp/test/Ice/plugin/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/packages.config +++ b/cpp/test/Ice/plugin/msbuild/testplugin/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 cde0090cf1d..bddafe883d9 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -95,11 +95,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 f2c948f264e..5192434a0cd 100644 --- a/cpp/test/Ice/properties/msbuild/client.vcxproj +++ b/cpp/test/Ice/properties/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/Ice/properties/msbuild/packages.config +++ b/cpp/test/Ice/properties/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 5a97513c679..d04e9bf16f1 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/proxy/msbuild/client/packages.config +++ b/cpp/test/Ice/proxy/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj index 2d4e6336aff..79afdfebbf1 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/packages.config +++ b/cpp/test/Ice/proxy/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/packages.config b/cpp/test/Ice/proxy/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/proxy/msbuild/server/packages.config +++ b/cpp/test/Ice/proxy/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj index 41dc9a692a2..ae5f425a629 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/proxy/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index d71b7042054..be106986159 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 cb1996c7286..8eef82ac02a 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -235,16 +235,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj index 3779d5907c1..2d9e12b71af 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj index 1ed21d1bc85..949e4b78465 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj index d1c4cb5a115..165aabf6593 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -266,16 +266,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/client/client.vcxproj index b117f763db4..08f903b2cc6 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/retry/msbuild/client/packages.config +++ b/cpp/test/Ice/retry/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj index f57956e3b91..dd7d6937c27 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -346,17 +346,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/packages.config +++ b/cpp/test/Ice/retry/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/server/packages.config b/cpp/test/Ice/retry/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/retry/msbuild/server/packages.config +++ b/cpp/test/Ice/retry/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/server/server.vcxproj index c9d8518cdc4..79e139d2be5 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -346,17 +346,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 fec9118f64f..2d7111c10c7 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -268,16 +268,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/retry/msbuild/uwp/client/packages.config b/cpp/test/Ice/retry/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/retry/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj index 3dff7a11d86..5a8d07cae69 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -270,16 +270,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/retry/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/server/packages.config b/cpp/test/Ice/retry/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/retry/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj index d0ee107ccfb..381a9b657d7 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/scope/msbuild/client/client.vcxproj b/cpp/test/Ice/scope/msbuild/client/client.vcxproj index aa89c888470..fe1dd21ed8e 100644 --- a/cpp/test/Ice/scope/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/scope/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/client/packages.config b/cpp/test/Ice/scope/msbuild/client/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/scope/msbuild/client/packages.config +++ b/cpp/test/Ice/scope/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/server/packages.config b/cpp/test/Ice/scope/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/scope/msbuild/server/packages.config +++ b/cpp/test/Ice/scope/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/server/server.vcxproj b/cpp/test/Ice/scope/msbuild/server/server.vcxproj index 4c5040700e1..8a732a58013 100644 --- a/cpp/test/Ice/scope/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/scope/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -350,17 +350,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj index a32ae209d77..9dbc8484b59 100644 --- a/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/scope/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/scope/msbuild/uwp/client/packages.config b/cpp/test/Ice/scope/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/scope/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/scope/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/uwp/server/packages.config b/cpp/test/Ice/scope/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/scope/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/scope/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj index 2a6c6515d05..9aacaac727f 100644 --- a/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/scope/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -276,16 +276,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj index 56a090427d1..43701036b7f 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj index 0502df1780d..ca594a0d524 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -346,17 +346,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/server/packages.config b/cpp/test/Ice/servantLocator/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj index 2696e4c47eb..3ad98a1fed7 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -345,17 +345,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj index 0126476cd22..2e21f60cc9a 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -353,17 +353,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 03cf21da148..9f1f8c39ea2 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -273,16 +273,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj index 0c9791a785d..1b8ef5632bb 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/collocated.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -275,16 +275,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/collocated/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj index a1dd44dc80e..885f65d4edb 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -279,16 +279,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj index 8b63e0c842b..6096fea81b4 100644 --- a/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -286,16 +286,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj b/cpp/test/Ice/services/msbuild/client.vcxproj index 0c0aaaefb79..3b4be78e594 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -350,17 +350,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/services/msbuild/packages.config +++ b/cpp/test/Ice/services/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj index b9f3197ba6e..a1e476d9eaa 100644 --- a/cpp/test/Ice/services/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/services/msbuild/uwp/client/packages.config b/cpp/test/Ice/services/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/services/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/services/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj index 88f9bd7909d..0347ba8741c 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -465,17 +465,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj index 490eef99c5c..f43f7a42bce 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -506,17 +506,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj index 8ce00f9c97f..ee3a1ebe504 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -506,17 +506,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 670a52f8326..48c55f72a12 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -370,16 +370,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> 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 dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj index 36f96c58f0a..079c171b4f5 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -376,16 +376,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> 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 dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj index 17f82d28cca..63f120244e0 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -377,16 +377,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj index e6de26e57f9..966f8c875e6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -465,17 +465,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/packages.config b/cpp/test/Ice/slicing/objects/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj index 850d4a5ff0b..6d5ffc00bb8 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -506,17 +506,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj index c87e3d73bd4..395f59eaff2 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -506,17 +506,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 eb5b5f2328c..e3ccf78a5bc 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -370,16 +370,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> 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 dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config b/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj index cd650fa7765..f7360dae810 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -376,16 +376,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> 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 dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj index efa389fcf76..b4e8c172d51 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/uwp/serveramd/serveramd.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -377,16 +377,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj b/cpp/test/Ice/stream/msbuild/client.vcxproj index ad7540ab40b..f9fe2ab1129 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -325,17 +325,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/stream/msbuild/packages.config +++ b/cpp/test/Ice/stream/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj index 9d09f35d6dd..577032aa5cc 100644 --- a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -264,16 +264,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/stream/msbuild/uwp/packages.config b/cpp/test/Ice/stream/msbuild/uwp/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/stream/msbuild/uwp/packages.config +++ b/cpp/test/Ice/stream/msbuild/uwp/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj index d78c19f847b..07f91f482e8 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -301,17 +301,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/server/packages.config b/cpp/test/Ice/stringConverter/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj index 8df8e3d69e7..780d729ae05 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -341,17 +341,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 ca2fbe1638d..005d392d2c7 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -234,16 +234,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config b/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config b/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj index 8ed305f8b5b..357b0fba7ec 100644 --- a/cpp/test/Ice/stringConverter/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -269,16 +269,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj index cd0f0ed955a..6cb2e942552 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config b/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj index c6fc3a3f03b..8141ddb21ed 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj index df5131c2d2a..72e8645f509 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 6c8a6259c56..bb9be4066fc 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -344,17 +344,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/timeout/msbuild/client/packages.config +++ b/cpp/test/Ice/timeout/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/server/packages.config b/cpp/test/Ice/timeout/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/timeout/msbuild/server/packages.config +++ b/cpp/test/Ice/timeout/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj index 81e0e0e96b7..4bae26149ec 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0fb751ab513..c7c2c005142 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -266,16 +266,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config b/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/timeout/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config b/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/timeout/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj index 8ebdb4e9eb4..4cc5ddf7b11 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/client/client.vcxproj index 4cfb53fb557..3caa78b85a5 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/udp/msbuild/client/packages.config +++ b/cpp/test/Ice/udp/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/server/packages.config b/cpp/test/Ice/udp/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Ice/udp/msbuild/server/packages.config +++ b/cpp/test/Ice/udp/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/server/server.vcxproj index 0c2a3bc974f..83bbaf64073 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 f0e173dd18d..05649d3272a 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/Ice/udp/msbuild/uwp/client/packages.config b/cpp/test/Ice/udp/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/client/packages.config +++ b/cpp/test/Ice/udp/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/uwp/server/packages.config b/cpp/test/Ice/udp/msbuild/uwp/server/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/server/packages.config +++ b/cpp/test/Ice/udp/msbuild/uwp/server/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj index b054d5d4144..22ed9ccb684 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -271,16 +271,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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj index ee5c6488dd2..a5b63bd88b0 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceBox/admin/msbuild/client/packages.config +++ b/cpp/test/IceBox/admin/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/testservice/packages.config b/cpp/test/IceBox/admin/msbuild/testservice/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/admin/msbuild/testservice/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj index 937a065ce32..d599fa26291 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -263,12 +263,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -367,17 +367,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e41d4aca194..36e8f83bf03 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/packages.config b/cpp/test/IceBox/configuration/msbuild/testservice/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/testservice/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj index 98034407fd2..d79376bd2bc 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -263,12 +263,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -367,17 +367,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj index fd223d494ed..eab5d8bc9fd 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -302,17 +302,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/client/packages.config b/cpp/test/IceBridge/simple/msbuild/client/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/packages.config +++ b/cpp/test/IceBridge/simple/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/server/packages.config b/cpp/test/IceBridge/simple/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/packages.config +++ b/cpp/test/IceBridge/simple/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj index a644dbc6c28..51650636fcd 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -346,17 +346,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 c450b8267a2..1f6e6aa8f62 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -326,17 +326,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/packages.config b/cpp/test/IceDiscovery/simple/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj index ae608935a91..5aa38a0a564 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -351,17 +351,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 983dba6891a..2893951d410 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/client/packages.config b/cpp/test/IceGrid/activation/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/server/packages.config b/cpp/test/IceGrid/activation/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj index 16902dd47ba..fa72bb757e9 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/admin/msbuild/packages.config b/cpp/test/IceGrid/admin/msbuild/packages.config index de72e3ebfd2..2750f8b6972 100644 --- a/cpp/test/IceGrid/admin/msbuild/packages.config +++ b/cpp/test/IceGrid/admin/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 de86f32ee2d..a8cfce49e50 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -91,10 +91,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj index 1f26d1abf7d..2ee9bd73ddf 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/client/packages.config b/cpp/test/IceGrid/allocation/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/server/packages.config b/cpp/test/IceGrid/allocation/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj index 02909209095..ed4f6bc7ad5 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config b/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config index de72e3ebfd2..2750f8b6972 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 4fdeb36b73d..94e800e5945 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -85,10 +85,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj index 35d6c55f822..30942b1df6f 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/client/packages.config b/cpp/test/IceGrid/deployer/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/server/packages.config b/cpp/test/IceGrid/deployer/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj index 59fda3f1879..89fbc8f5b5c 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj index 795cedccaf5..010bb36aeed 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,15 +362,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj index d95820f324f..74f67848639 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/client/packages.config b/cpp/test/IceGrid/distribution/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/server/packages.config b/cpp/test/IceGrid/distribution/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj index b5bf68cb4d4..550a6012572 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj index c828ec9ce64..42a0ce4a674 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj index f716cb0d4cd..78b3d2d3159 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj index 234beda63b3..c4e9b6ac3c1 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,15 +362,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj index f24f770f748..1ae7a50c05e 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config index de72e3ebfd2..2750f8b6972 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 5896dcd7481..4ae3167f9bf 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -91,10 +91,10 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -166,13 +166,13 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj index 13afa41bdbc..b6bde1d5e2a 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj index 9868c3634ae..94cfb253b7f 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,15 +362,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj index c96bcfe183a..3b5c55a294e 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/client/packages.config b/cpp/test/IceGrid/replication/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/server/packages.config b/cpp/test/IceGrid/replication/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj index e326aea8758..d711eb78256 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj index 5aa221e07c3..da019aafd2b 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -297,15 +297,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/client/packages.config b/cpp/test/IceGrid/session/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/session/msbuild/client/packages.config +++ b/cpp/test/IceGrid/session/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/server/packages.config b/cpp/test/IceGrid/session/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/session/msbuild/server/packages.config +++ b/cpp/test/IceGrid/session/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj index 70340629328..b2f24e17830 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/verifier/packages.config b/cpp/test/IceGrid/session/msbuild/verifier/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/session/msbuild/verifier/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj index e7cecd3a1f4..abcf1455f68 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj index 7655f150d67..abfbe943ce2 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -345,15 +345,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/client/packages.config b/cpp/test/IceGrid/simple/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/server/packages.config b/cpp/test/IceGrid/simple/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj index 17c9d287a1a..e5fc3755124 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj index c37e8473f68..dd3d4239a49 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -321,15 +321,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/client/packages.config b/cpp/test/IceGrid/update/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/update/msbuild/client/packages.config +++ b/cpp/test/IceGrid/update/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/server/packages.config b/cpp/test/IceGrid/update/msbuild/server/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceGrid/update/msbuild/server/packages.config +++ b/cpp/test/IceGrid/update/msbuild/server/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj index 80288177dce..6a4f24d8235 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -86,11 +86,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -338,15 +338,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 95298a75506..aa03b690ca4 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -342,17 +342,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/client/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj index 325e944b41d..74c546b76b7 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -85,9 +85,9 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets')" /> @@ -347,12 +347,12 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets'))" /> diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config index a7dffa413f4..bfb8e845f07 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> <package id="zeroc.openssl.v120" version="1.1.1" targetFramework="native" /> <package id="zeroc.openssl.v140" version="1.1.1" targetFramework="native" /> diff --git a/cpp/test/IceSSL/configuration/msbuild/server/packages.config b/cpp/test/IceSSL/configuration/msbuild/server/packages.config index e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/server/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj index 2c2542a15f7..45ebaa999f1 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -343,17 +343,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 a7dffa413f4..bfb8e845f07 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> <package id="zeroc.openssl.v120" version="1.1.1" targetFramework="native" /> <package id="zeroc.openssl.v140" version="1.1.1" targetFramework="native" /> diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj index 0cc082c8870..b6b5b2fd067 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -85,9 +85,9 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets')" /> @@ -353,12 +353,12 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets'))" /> diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj index b28c55123d4..795f9ef69d2 100644 --- a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/uwp/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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -76,10 +76,10 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config b/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/packages.config b/cpp/test/IceStorm/federation/msbuild/publisher/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/publisher/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj index 140f1a66f53..1fc6d608563 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -296,15 +296,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj index 3ba0134b1cd..c9422157cae 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj index 784b62e5735..6113e051f54 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -296,15 +296,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj index 263e608a1f1..1b6a146de87 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj b/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj index 0945796ee21..947c2698fbf 100644 --- a/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj +++ b/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -92,11 +92,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -131,15 +131,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceStorm/persistent/msbuild/client/packages.config b/cpp/test/IceStorm/persistent/msbuild/client/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/persistent/msbuild/client/packages.config +++ b/cpp/test/IceStorm/persistent/msbuild/client/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config b/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj index 7b4e68a12dc..aab4e5b8722 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -296,15 +296,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/sub/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj index 604648ee57b..6944c4a6dd5 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj index 1e087e58356..ec5a5ad8258 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 bb8302bad25..7521fb1a173 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -296,15 +296,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/packages.config +++ b/cpp/test/IceStorm/repgrid/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj index cb2127a40ba..03c21954a49 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -418,11 +418,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -497,15 +497,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/control/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config b/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config index 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj index 07a3746a24b..98400e55942 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -418,11 +418,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -457,15 +457,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj index f9e094497ab..28cc69745be 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -418,11 +418,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -497,15 +497,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/single/msbuild/publisher/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj index 2cf4f7bec7a..391503608e3 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -296,15 +296,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/single/msbuild/subscriber/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj index f03b9e8f781..405fdae523a 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/publisher/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj index 3e9df9788c5..8cec12893fb 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -296,15 +296,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 5e1aac732c6..f8f5f46fff2 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj index 0daacf63b95..f425a91c518 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -257,11 +257,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -336,15 +336,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 1443947e87e..85155f01382 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 405a1d48d31..8b7b48399f4 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/packages.config +++ b/cpp/test/IceUtil/inputUtil/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 04dfb295b30..c770bf590ae 100644 --- a/cpp/test/IceUtil/priority/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/priority/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -183,15 +183,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/priority/msbuild/packages.config +++ b/cpp/test/IceUtil/priority/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 dc2a11f86f7..2bc731ba27e 100644 --- a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/sha1/msbuild/packages.config +++ b/cpp/test/IceUtil/sha1/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS index d81dc99ae6b..7e0b705f4b1 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS @@ -1,7 +1,7 @@ - 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7.4.dylib - 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.4.dylib - 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.4.dylib - 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.4.dylib + 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7.5.dylib + 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper(char const*, int) in libIce.3.7.5.dylib + 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.5.dylib + 3 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.5.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-xcode10.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS index 9aef1eba4f7..5cc9146b2bb 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS @@ -1,4 +1,4 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.4.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.5.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.release-xcode9.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS index 0ee9eb16e0a..3dc9fd9f8d1 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS @@ -1,3 +1,3 @@ - 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.4.dylib + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.5.dylib 1 Client::run(int, char**) in client 2 int Test::runTest<Client>(int, char**) in client diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj index f0156881e66..9846966bb8b 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -213,15 +213,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/packages.config +++ b/cpp/test/IceUtil/stacktrace/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 43054d808df..cf88ea11e5f 100644 --- a/cpp/test/IceUtil/thread/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/thread/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -195,15 +195,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/thread/msbuild/packages.config +++ b/cpp/test/IceUtil/thread/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 ea04e631dcb..1c74c1ba1d0 100644 --- a/cpp/test/IceUtil/timer/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/timer/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/timer/msbuild/packages.config +++ b/cpp/test/IceUtil/timer/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 6ab1f6f7dfd..faaf43c0e58 100644 --- a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/unicode/msbuild/packages.config +++ b/cpp/test/IceUtil/unicode/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 e689a1d6c8c..81ab570c132 100644 --- a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -89,11 +89,11 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -171,15 +171,15 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 0f950a6578c..eae7ba765b3 100644 --- a/cpp/test/IceUtil/uuid/msbuild/packages.config +++ b/cpp/test/IceUtil/uuid/msbuild/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" 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 5b485289294..e6d2f6593c3 100644 --- a/cpp/test/Slice/escape/msbuild/client.vcxproj +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -502,17 +502,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Slice/escape/msbuild/packages.config +++ b/cpp/test/Slice/escape/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj b/cpp/test/Slice/macros/msbuild/client.vcxproj index 7e995fbc98e..aa0129a362b 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -341,17 +341,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Slice/macros/msbuild/packages.config +++ b/cpp/test/Slice/macros/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index f0e2e14f2e6..61d440eadc9 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -421,12 +421,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -503,17 +503,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Slice/parser/msbuild/packages.config +++ b/cpp/test/Slice/parser/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/structure/msbuild/client.vcxproj b/cpp/test/Slice/structure/msbuild/client.vcxproj index 164a069efaf..6b6d6603bb5 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj +++ b/cpp/test/Slice/structure/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -341,17 +341,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Slice/structure/msbuild/packages.config +++ b/cpp/test/Slice/structure/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj index 0f28871e956..224d21a881e 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -90,12 +90,12 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -340,17 +340,17 @@ <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For 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.4\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.4\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.4\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.4\build\native\zeroc.ice.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.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 e25428cfc82..26e4a064ac6 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/packages.config +++ b/cpp/test/Slice/utf8BOM/msbuild/packages.config @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.v100" version="3.7.4" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> + <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj b/cpp/test/uwp/controller/msbuild/controller.vcxproj index b4809307002..98cad1aeacb 100644 --- a/cpp/test/uwp/controller/msbuild/controller.vcxproj +++ b/cpp/test/uwp/controller/msbuild/controller.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.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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> @@ -1919,26 +1919,26 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> </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.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.4\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.4\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.4\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.4\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.4\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\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.5\build\native\zeroc.ice.uwp.v141.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> diff --git a/cpp/test/uwp/controller/msbuild/packages.config b/cpp/test/uwp/controller/msbuild/packages.config index dd4bbcef409..747264466f0 100644 --- a/cpp/test/uwp/controller/msbuild/packages.config +++ b/cpp/test/uwp/controller/msbuild/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.ice.uwp.v140" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.4" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.4" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> + <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file |