diff options
author | Jose <jose@zeroc.com> | 2019-07-09 17:28:56 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2019-07-09 17:28:56 +0200 |
commit | 9bb1f40c2149edadcfc24892635b1f36d649cc6f (patch) | |
tree | b7bf38fb444a3a4a1eef23bb998ec065953f5ff3 | |
parent | Fix ice.xcodeproj path issue (diff) | |
parent | Remove forward declarations limitation - Close #97 (diff) | |
download | ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.bz2 ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.xz ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.zip |
Merge remote-tracking branch 'origin/3.7' into swift
492 files changed, 3408 insertions, 1008 deletions
diff --git a/CHANGELOG-3.7.md b/CHANGELOG-3.7.md index ee9fb987522..5facbe9bdb5 100644 --- a/CHANGELOG-3.7.md +++ b/CHANGELOG-3.7.md @@ -9,12 +9,13 @@ applications to this release, and the manual for complete details on a particular aspect of Ice. - [Changes in Ice 3.7.3](#changes-in-ice-373) - * [C# Changes](#c-changes) + * [C++ Changes](#c-changes) + * [C# Changes](#c-changes-1) * [Java Changes](#java-changes) - [Changes in Ice 3.7.2](#changes-in-ice-372) * [General Changes](#general-changes) - * [C++ Changes](#c-changes-1) - * [C# Changes](#c-changes-2) + * [C++ Changes](#c-changes-2) + * [C# Changes](#c-changes-3) * [Java Changes](#java-changes) * [JavaScript Changes](#javascript-changes) * [MATLAB Changes](#matlab-changes) @@ -23,8 +24,8 @@ particular aspect of Ice. * [Python Changes](#python-changes) - [Changes in Ice 3.7.1](#changes-in-ice-371) * [General Changes](#general-changes-1) - * [C++ Changes](#c-changes-3) - * [C# Changes](#c-changes-4) + * [C++ Changes](#c-changes-4) + * [C# Changes](#c-changes-5) * [Java Changes](#java-changes-1) * [JavaScript Changes](#javascript-changes-1) * [MATLAB Changes](#matlab-changes-1) @@ -34,8 +35,8 @@ particular aspect of Ice. * [Ruby Changes](#ruby-changes) - [Changes in Ice 3.7.0](#changes-in-ice-370) * [General Changes](#general-changes-2) - * [C++ Changes](#c-changes-5) - * [C# Changes](#c-changes-6) + * [C++ Changes](#c-changes-6) + * [C# Changes](#c-changes-7) * [Java Changes](#java-changes-2) * [JavaScript Changes](#javascript-changes-2) * [Objective-C Changes](#objective-c-changes-2) @@ -47,6 +48,15 @@ particular aspect of Ice. These are the changes since Ice 3.7.2. +## C++ Changes + +- Fixed IceGrid node bug where the setting of supplementary groups would fail + if the user had more than NGROUPS_MAX groups. + +- Fixed IceGrid node bug where the setting of supplementary groups for a server + ran as a given user was incorrect when running the IceGrid node as root. The + server would be ran with the root/wheel supplementary group. + ## Java Changes - Added back support for caching the output stream used to marshal the response diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 9c568f75ef5..a9a4508e910 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -656,6 +656,15 @@ Activator::activate(const string& name, getgrouplist(pw->pw_name, gid, &groups[0], &ngroups); #endif } + else + { + groups.resize(static_cast<size_t>(ngroups)); + } + + if(groups.size() > NGROUPS_MAX) + { + groups.resize(NGROUPS_MAX); + } int fds[2]; if(pipe(fds) != 0) @@ -719,9 +728,16 @@ Activator::activate(const string& name, if(getuid() == 0 && setgroups(static_cast<int>(groups.size()), &groups[0]) == -1) { ostringstream os; - os << pw->pw_name; - reportChildError(getSystemErrno(), errorFds[1], "cannot set process supplementary groups", os.str().c_str(), - _traceLevels); + for(vector<gid_t>::const_iterator p = groups.begin(); p != groups.end(); ++p) + { + os << *p; + if(p + 1 != groups.end()) + { + os << ", "; + } + } + reportChildError(getSystemErrno(), errorFds[1], "cannot set process supplementary groups", + os.str().c_str(), _traceLevels); } if(setuid(uid) == -1) diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index ca9c6d24121..bb81379349b 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2998,67 +2998,61 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason) if(_node->getTraceLevels()->server > 1) { + Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); if(_state == ServerI::Active) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Active'"; } else if(_state == ServerI::Inactive) { if(_node->getTraceLevels()->server != 2 && !(previous == ServerI::Loading || previous == ServerI::Patching)) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Inactive'"; } } else if(_state == ServerI::Destroyed) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Destroyed'"; } else if(_node->getTraceLevels()->server > 2) { if(_state == ServerI::WaitForActivation) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `WaitForActivation'"; } else if(_state == ServerI::ActivationTimeout) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `ActivationTimeout'"; } else if(_state == ServerI::Activating) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Activating'"; } else if(_state == ServerI::Deactivating) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Deactivating'"; } else if(_state == ServerI::DeactivatingWaitForProcess) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `DeactivatingWaitForProcess'"; } else if(_state == ServerI::Destroying) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Destroying'"; } else if(_state == ServerI::Loading) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Loading'"; } else if(_state == ServerI::Patching) { - Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat); out << "changed server `" << _id << "' state to `Loading'"; } } + if(!reason.empty()) + { + out << "\nreason = " << reason; + } } } diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 853bbed5d49..0ea48a5a2d1 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -752,13 +752,13 @@ Slice::typeToString(const TypePtr& type, const string& scope, const StringList& // Non local classes without operations map to the base // proxy class shared_ptr<Ice::ObjectPrx> // - if(def && !def->isInterface() && def->allOperations().empty()) + if(!def || def->isAbstract()) { - return getUnqualified(cpp11BuiltinTable[Builtin::KindObjectProxy], scope); + return "::std::shared_ptr<" + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">"; } else { - return "::std::shared_ptr<" + getUnqualified(fixKwd(proxy->_class()->scoped() + "Prx"), scope) + ">"; + return getUnqualified(cpp11BuiltinTable[Builtin::KindObjectProxy], scope); } } else diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 327e4b92a5d..78dd64f2080 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -3764,8 +3764,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type, if(proxy) { ClassDefPtr def = proxy->_class()->definition(); - assert(def); - if(def->isAbstract()) + if(!def || def->isAbstract()) { return getUnqualified(proxy->_class(), package, "", "Prx"); } diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index e0ed44f449e..7e0149b602b 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -6896,11 +6896,6 @@ Slice::Unit::parse(const string& filename, FILE* file, bool debug) popContainer(); assert(_definitionContextStack.size() == 1); popDefinitionContext(); - - if(!checkUndefinedTypes()) - { - status = EXIT_FAILURE; - } } Slice::unit = 0; @@ -6999,113 +6994,6 @@ Slice::Unit::eraseWhiteSpace(string& s) } } -bool -Slice::Unit::checkUndefinedTypes() -{ - class Visitor : public ParserVisitor - { - public: - - Visitor(int& errors) : - _errors(errors), - _local(false) - { - } - - virtual bool visitClassDefStart(const ClassDefPtr& p) - { - _local = p->isLocal(); - return true; - } - - virtual bool visitExceptionStart(const ExceptionPtr& p) - { - _local = p->isLocal(); - return true; - } - - virtual bool visitStructStart(const StructPtr& p) - { - _local = p->isLocal(); - return true; - } - - virtual void visitOperation(const OperationPtr& p) - { - if(p->returnType()) - { - checkUndefined(p->returnType(), "return type", p->file(), p->line()); - } - ParamDeclList params = p->parameters(); - for(ParamDeclList::const_iterator q = params.begin(); q != params.end(); ++q) - { - checkUndefined((*q)->type(), "parameter " + (*q)->name(), (*q)->file(), (*q)->line()); - } - } - - virtual void visitParamDecl(const ParamDeclPtr& p) - { - checkUndefined(p->type(), "parameter " + p->name(), p->file(), p->line()); - } - - virtual void visitDataMember(const DataMemberPtr& p) - { - checkUndefined(p->type(), "member " + p->name(), p->file(), p->line()); - } - - virtual void visitSequence(const SequencePtr& p) - { - _local = p->isLocal(); - checkUndefined(p->type(), "element type", p->file(), p->line()); - } - - virtual void visitDictionary(const DictionaryPtr& p) - { - _local = p->isLocal(); - checkUndefined(p->keyType(), "key type", p->file(), p->line()); - checkUndefined(p->valueType(), "value type", p->file(), p->line()); - } - - private: - - void checkUndefined(const TypePtr& type, const string& desc, const string& file, const string& line) - { - // - // See ICE-6867. Any use of a proxy requires the full type definition, as does any - // use of a class in a non-local context. - // - ProxyPtr p = ProxyPtr::dynamicCast(type); - if(p) - { - const ClassDeclPtr cl = p->_class(); - if(!cl->definition()) - { - ostringstream ostr; - ostr << desc << " uses a proxy for undefined type `" << cl->scoped() << "'"; - emitError(file, line, ostr.str()); - _errors++; - } - } - - ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type); - if(cl && !cl->definition() && !_local) - { - ostringstream ostr; - ostr << desc << " refers to undefined type `" << cl->scoped() << "'"; - emitError(file, line, ostr.str()); - _errors++; - } - } - - int& _errors; - bool _local; - }; - - Visitor v(_errors); - visit(&v, true); - return _errors == 0; -} - // ---------------------------------------------------------------------- // CICompare // ---------------------------------------------------------------------- diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h index a4bfccd6a2d..4884695abca 100644 --- a/cpp/src/Slice/Parser.h +++ b/cpp/src/Slice/Parser.h @@ -1145,7 +1145,6 @@ private: Unit(bool, bool, bool, bool, const StringList&); static void eraseWhiteSpace(::std::string&); - bool checkUndefinedTypes(); bool _ignRedefs; bool _all; diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index eea8791ec4c..af1f273ac6d 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -1224,7 +1224,7 @@ Slice::Ruby::CodeVisitor::writeType(const TypePtr& p) if(prx) { ClassDefPtr def = prx->_class()->definition(); - if(def->isInterface() || def->allOperations().size() > 0) + if(!def || def->isAbstract()) { _out << getAbsolute(prx->_class(), IdentToUpper, "T_") << "Prx"; } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 37d0a42a8b8..eab9a81b8cb 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -978,6 +978,7 @@ Slice::Gen::generate(const UnitPtr& p) { string md = *q++; static const string includePrefix = "cpp:include:"; + static const string sourceIncludePrefix = "cpp:source-include:"; if(md.find(includePrefix) == 0) { if(md.size() > includePrefix.size()) @@ -992,6 +993,20 @@ Slice::Gen::generate(const UnitPtr& p) globalMetaData.remove(md); } } + else if(md.find(sourceIncludePrefix) == 0) + { + if(md.size() > sourceIncludePrefix.size()) + { + C << nl << "#include <" << md.substr(sourceIncludePrefix.size()) << ">"; + } + else + { + ostringstream ostr; + ostr << "ignoring invalid global metadata `" << md << "'"; + dc->warning(InvalidMetaData, file, -1, ostr.str()); + globalMetaData.remove(md); + } + } } dc->setMetaData(globalMetaData); } @@ -5371,6 +5386,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p) if(s.find(prefix) == 0) { static const string cppIncludePrefix = "cpp:include:"; + static const string cppSourceIncludePrefix = "cpp:source-include"; static const string cppHeaderExtPrefix = "cpp:header-ext:"; static const string cppSourceExtPrefix = "cpp:source-ext:"; static const string cppDllExportPrefix = "cpp:dll-export:"; @@ -5380,6 +5396,10 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p) { continue; } + else if(s.find(cppSourceIncludePrefix) == 0 && s.size() > cppSourceIncludePrefix.size()) + { + continue; + } else if(s.find(cppHeaderExtPrefix) == 0 && s.size() > cppHeaderExtPrefix.size()) { headerExtension++; diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp index de027895412..36db22c4350 100644 --- a/cpp/src/slice2cs/CsUtil.cpp +++ b/cpp/src/slice2cs/CsUtil.cpp @@ -1,4 +1,3 @@ - // // Copyright (c) ZeroC, Inc. All rights reserved. // @@ -458,7 +457,7 @@ Slice::CsGenerator::typeToString(const TypePtr& type, const string& package, boo if(proxy) { ClassDefPtr def = proxy->_class()->definition(); - if(def->isInterface() || def->allOperations().size() > 0) + if(!def || def->isAbstract()) { return getUnqualified(proxy->_class(), package, "", "Prx"); } @@ -794,7 +793,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, if(prx) { ClassDefPtr def = prx->_class()->definition(); - if(def->isInterface() || def->allOperations().size() > 0) + if(!def || def->isAbstract()) { string typeS = typeToString(type, package); if(marshal) diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index 1a6c60177b1..f59050a784e 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -2180,7 +2180,7 @@ Slice::Gen::TypesVisitor::encodeTypeForOperation(const TypePtr& type) if(proxy) { ClassDefPtr def = proxy->_class()->definition(); - if(def->isInterface() || def->allOperations().size() > 0) + if(!def || def->isAbstract()) { return "\"" + fixId(proxy->_class()->scoped() + "Prx") + "\""; } diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp index 07c2f9b5325..2229d81f6a9 100644 --- a/cpp/src/slice2js/JsUtil.cpp +++ b/cpp/src/slice2js/JsUtil.cpp @@ -500,17 +500,7 @@ Slice::JsGenerator::typeToString(const TypePtr& type, { ostringstream os; ClassDefPtr def = proxy->_class()->definition(); - if(!def->isInterface() && def->allOperations().empty()) - { - if(getModuleMetadata(toplevel) != "ice") - { - os << "iceNS0."; - } - os << getUnqualified(typeScriptBuiltinTable[Builtin::KindObjectProxy], - toplevel->scope(), - getModuleMetadata(toplevel)); - } - else + if(!def || def->isAbstract()) { string prefix; if(typescript) @@ -528,6 +518,16 @@ Slice::JsGenerator::typeToString(const TypePtr& type, os << fixId(proxy->_class()->scoped() + "Prx"); } } + else + { + if(getModuleMetadata(toplevel) != "ice") + { + os << "iceNS0."; + } + os << getUnqualified(typeScriptBuiltinTable[Builtin::KindObjectProxy], + toplevel->scope(), + getModuleMetadata(toplevel)); + } return os.str(); } @@ -983,7 +983,7 @@ Slice::JsGenerator::getHelper(const TypePtr& type) if(prx) { ClassDefPtr def = prx->_class()->definition(); - if(def->isInterface() || def->allOperations().size() > 0) + if(!def || def->isAbstract()) { return typeToString(type); } diff --git a/cpp/test/Common/msbuild/packages.config b/cpp/test/Common/msbuild/packages.config index 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Common/msbuild/packages.config +++ b/cpp/test/Common/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 c03618ba350..950f5572bf7 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -181,6 +182,7 @@ <Import Project="..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> @@ -196,5 +198,7 @@ <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj index e32a06e2801..beced8b1869 100644 --- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/application/msbuild/client/packages.config +++ b/cpp/test/Glacier2/application/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/application/msbuild/server/packages.config +++ b/cpp/test/Glacier2/application/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7d118caff5f..8960d1a462f 100644 --- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 47258ea28db..c96753a6d3a 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +345,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/attack/msbuild/client/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/packages.config +++ b/cpp/test/Glacier2/attack/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 946f2bd0144..5b94f7702ab 100644 --- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 7a92e6eeb74..e8ed6306fb7 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 1bfdb8d7017..dd35cfd2d10 100644 --- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +350,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 384fba2738a..b2129a8fbb9 100644 --- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -262,6 +263,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/override/msbuild/client/packages.config +++ b/cpp/test/Glacier2/override/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/override/msbuild/server/packages.config +++ b/cpp/test/Glacier2/override/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 70c84dbccad..266c6a4e620 100644 --- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Glacier2/router/CallbackI.cpp b/cpp/test/Glacier2/router/CallbackI.cpp index eba5aa33b2a..920a611c266 100644 --- a/cpp/test/Glacier2/router/CallbackI.cpp +++ b/cpp/test/Glacier2/router/CallbackI.cpp @@ -190,7 +190,8 @@ CallbackReceiverI::waitCallbackOK() Lock sync(*this); while(!_waitCallback) { - wait(); + timedWait(IceUtil::Time::seconds(30)); + test(_waitCallback); } _waitCallback = false; diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj index f43c4f4f279..cd423d81a5f 100644 --- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -262,6 +263,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/router/msbuild/client/packages.config +++ b/cpp/test/Glacier2/router/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/router/msbuild/server/packages.config +++ b/cpp/test/Glacier2/router/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 9e035fbaa6f..bdadae5369b 100644 --- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 46e6c82dac9..416fd6595d4 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 9a6852b2f76..1c54dcb0d2e 100644 --- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 0bcdfbd7a3e..93f0d5760e7 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config +++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 de2671c7bff..d76bdd4b364 100644 --- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 f121668f7e8..6ed1c9f752d 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -93,6 +94,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -170,5 +172,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 ba5d95c3df8..3c0f2a22ca2 100644 --- a/cpp/test/Glacier2/ssl/msbuild/client/packages.config +++ b/cpp/test/Glacier2/ssl/msbuild/client/packages.config @@ -3,4 +3,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 ba5d95c3df8..3c0f2a22ca2 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/packages.config +++ b/cpp/test/Glacier2/ssl/msbuild/server/packages.config @@ -3,4 +3,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 f8d0c33f2fa..1d4477ddf69 100644 --- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -87,6 +88,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -170,5 +172,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 d8db7661a46..b6b34059bcd 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -261,6 +262,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +345,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7a867f2271c..9e71c3c0cdb 100644 --- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj +++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 d8de829ed99..722a4129c2d 100644 --- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -334,5 +336,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/acm/msbuild/client/packages.config +++ b/cpp/test/Ice/acm/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/acm/msbuild/server/packages.config +++ b/cpp/test/Ice/acm/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7014d16b04d..4d17c8c72df 100644 --- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj index 6a2805ab961..7fffc2ee168 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 d6415165411..81adfc3541f 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -354,5 +356,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 ad6f305351c..5dad574d649 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +355,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj index 1cb01df1206..0ba69cbfb29 100644 --- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/admin/msbuild/client/packages.config +++ b/cpp/test/Ice/admin/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/admin/msbuild/server/packages.config +++ b/cpp/test/Ice/admin/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 9dc5135962c..6d7c98070b8 100644 --- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj index 4acdc408146..9bcb0403a97 100644 --- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/ami/msbuild/client/packages.config +++ b/cpp/test/Ice/ami/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 aefedd7c044..df0283383d1 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/ami/msbuild/collocated/packages.config +++ b/cpp/test/Ice/ami/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/ami/msbuild/server/packages.config +++ b/cpp/test/Ice/ami/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 81f6bbcda74..627d2360386 100644 --- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj b/cpp/test/Ice/background/msbuild/client/client.vcxproj index 87c38cdc9f2..cfd4d45fd44 100644 --- a/cpp/test/Ice/background/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -205,5 +207,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/background/msbuild/client/packages.config +++ b/cpp/test/Ice/background/msbuild/client/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/background/msbuild/server/packages.config +++ b/cpp/test/Ice/background/msbuild/server/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 0617325c1c5..84725eee6b7 100644 --- a/cpp/test/Ice/background/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -206,5 +208,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/packages.config +++ b/cpp/test/Ice/background/msbuild/testtransport/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 49cff3476ad..40563ff8eb5 100644 --- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj +++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -370,5 +372,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 d7ee20d7861..1acc4ca05ce 100644 --- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/binding/msbuild/client/packages.config +++ b/cpp/test/Ice/binding/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/binding/msbuild/server/packages.config +++ b/cpp/test/Ice/binding/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 a6887b73c1f..a648835318c 100644 --- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj index 972c58d4fb2..320ab9836b2 100644 --- a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -513,5 +515,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/checksum/msbuild/client/packages.config +++ b/cpp/test/Ice/checksum/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/checksum/msbuild/server/packages.config +++ b/cpp/test/Ice/checksum/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 77db572b9de..28657ed9ce7 100644 --- a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -514,5 +516,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj index 73ce1c541dc..e64638dac65 100644 --- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -515,5 +517,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/custom/msbuild/client/packages.config +++ b/cpp/test/Ice/custom/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 2ff68dfba3b..d0d023a0494 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -519,5 +521,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/custom/msbuild/collocated/packages.config +++ b/cpp/test/Ice/custom/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/custom/msbuild/server/packages.config +++ b/cpp/test/Ice/custom/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6429fce748a..2c76ec54645 100644 --- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -518,5 +520,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/custom/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 e6bfc3310ff..c9f0638bfe6 100644 --- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -518,5 +520,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj index 0ca9995ea7d..7686467bd25 100644 --- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> -</Project> +</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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/defaultServant/msbuild/packages.config +++ b/cpp/test/Ice/defaultServant/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 124117827e9..697a0d8db73 100644 --- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj +++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/defaultValue/msbuild/packages.config +++ b/cpp/test/Ice/defaultValue/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7a966583d1c..96adbb2afec 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/dispatcher/msbuild/client/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 813454a4789..2c9c70b92e8 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -354,5 +356,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/packages.config +++ b/cpp/test/Ice/dispatcher/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 b23b704f515..7f4306f935b 100644 --- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +355,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/echo/msbuild/packages.config b/cpp/test/Ice/echo/msbuild/packages.config index 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/echo/msbuild/packages.config +++ b/cpp/test/Ice/echo/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 b6c6a87a3a6..9587ad1b481 100644 --- a/cpp/test/Ice/echo/msbuild/server.vcxproj +++ b/cpp/test/Ice/echo/msbuild/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 8b6f18e61b2..3c21c9258bf 100644 --- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/enums/msbuild/client/packages.config +++ b/cpp/test/Ice/enums/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/enums/msbuild/server/packages.config +++ b/cpp/test/Ice/enums/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7a4b4765431..c4c8fcd0d1b 100644 --- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj index 5e355869732..313165ffffe 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -311,5 +313,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 ff76e17701c..98e008d5776 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +355,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 01c286d429f..4c60d884036 100644 --- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 21d7cf43169..db0b38aaed1 100644 --- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -360,5 +362,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj index 94bc3c591a5..3dffacdecf5 100644 --- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/facets/msbuild/client/packages.config +++ b/cpp/test/Ice/facets/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 2a5e38b084e..d502386a46f 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/facets/msbuild/collocated/packages.config +++ b/cpp/test/Ice/facets/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/facets/msbuild/server/packages.config +++ b/cpp/test/Ice/facets/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 bd05dc10b97..2ef90ace411 100644 --- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj index f02c654486c..ea360affca2 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/client/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/packages.config +++ b/cpp/test/Ice/faultTolerance/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7ab964ffc73..f31215a6eae 100644 --- a/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/faultTolerance/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 48d472004a0..b43e03e90ad 100644 --- a/cpp/test/Ice/gc/msbuild/client.vcxproj +++ b/cpp/test/Ice/gc/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +351,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/gc/msbuild/packages.config +++ b/cpp/test/Ice/gc/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 8344288dc47..fd7e41750b0 100644 --- a/cpp/test/Ice/hash/msbuild/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +351,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/hash/msbuild/packages.config +++ b/cpp/test/Ice/hash/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 e717ab70293..36594911b0a 100644 --- a/cpp/test/Ice/hold/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/hold/msbuild/client/packages.config +++ b/cpp/test/Ice/hold/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/hold/msbuild/server/packages.config +++ b/cpp/test/Ice/hold/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 70cdf8c8609..e61aa0abae6 100644 --- a/cpp/test/Ice/hold/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/impl/msbuild/server/packages.config b/cpp/test/Ice/impl/msbuild/server/packages.config index 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/impl/msbuild/server/packages.config +++ b/cpp/test/Ice/impl/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 39d66236fb5..f423c7b3379 100644 --- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -96,6 +97,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -490,5 +492,7 @@ $(IceToolsPath)\slice2cpp.exe -I$(IceHome)\slice $(IceBuilderImpl) ..\..\Test.ic <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/impl/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 17da59c0878..ee13ce5a46c 100644 --- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -96,6 +97,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -488,5 +490,7 @@ $(IceToolsPath)\slice2cpp.exe -I$(IceHome)\slice $(IceBuilderImpl) ..\..\TestAMD <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 67b25c42e6c..642409f7809 100644 --- a/cpp/test/Ice/info/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/info/msbuild/client/packages.config +++ b/cpp/test/Ice/info/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/info/msbuild/server/packages.config +++ b/cpp/test/Ice/info/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 e71ff253518..65856ca4c4d 100644 --- a/cpp/test/Ice/info/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj index 0c304064c29..60bedde32fb 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/inheritance/msbuild/client/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 5eed738b112..8eec166798f 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/inheritance/msbuild/collocated/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/packages.config +++ b/cpp/test/Ice/inheritance/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 3ff8b9f100b..ea11025ec5c 100644 --- a/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj index 7df7982eeb3..663bb24316a 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -217,5 +219,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/interceptor/msbuild/client/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/client/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 107c954b24a..96e93499a08 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -357,5 +359,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 3d6bfd8b5f7..bd1e04bf31a 100644 --- a/cpp/test/Ice/invoke/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/invoke/msbuild/client/packages.config +++ b/cpp/test/Ice/invoke/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/invoke/msbuild/server/packages.config +++ b/cpp/test/Ice/invoke/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 e7e791202b6..b69ffaa5828 100644 --- a/cpp/test/Ice/invoke/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj index 73d09545674..8c4e115c1d7 100644 --- a/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj +++ b/cpp/test/Ice/library/msbuild/alltests/alltests.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -210,5 +212,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/library/msbuild/alltests/packages.config +++ b/cpp/test/Ice/library/msbuild/alltests/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 77721df6189..1f03a028c15 100644 --- a/cpp/test/Ice/library/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/library/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -178,5 +180,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> -</Project> +</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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/library/msbuild/client/packages.config +++ b/cpp/test/Ice/library/msbuild/client/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 db0f99b371f..38180ea820b 100644 --- a/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj +++ b/cpp/test/Ice/library/msbuild/consumer/consumer.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -210,5 +212,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/library/msbuild/consumer/packages.config +++ b/cpp/test/Ice/library/msbuild/consumer/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 8867e9993c5..49e43cbdc0d 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -316,5 +318,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/library/msbuild/gencode/packages.config +++ b/cpp/test/Ice/library/msbuild/gencode/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 92a473fb6dc..b028a779466 100644 --- a/cpp/test/Ice/location/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/location/msbuild/client/packages.config +++ b/cpp/test/Ice/location/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/location/msbuild/server/packages.config +++ b/cpp/test/Ice/location/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 669b199c042..f3873b144b2 100644 --- a/cpp/test/Ice/location/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +355,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj index 1b14cff0a4a..fb75f97a6f8 100644 --- a/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client1/client1.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -98,6 +99,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/logger/msbuild/client1/packages.config +++ b/cpp/test/Ice/logger/msbuild/client1/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 18de1ad7c44..dd27e398588 100644 --- a/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client2/client2.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -98,6 +99,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/logger/msbuild/client2/packages.config +++ b/cpp/test/Ice/logger/msbuild/client2/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 f54f3a142dc..1dd6db27f38 100644 --- a/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client3/client3.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -98,6 +99,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/logger/msbuild/client3/packages.config +++ b/cpp/test/Ice/logger/msbuild/client3/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 6beedff9071..eaf7e717193 100644 --- a/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client4/client4.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -98,6 +99,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/logger/msbuild/client4/packages.config +++ b/cpp/test/Ice/logger/msbuild/client4/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 ef75ab994ce..3da8ed8afe9 100644 --- a/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj +++ b/cpp/test/Ice/logger/msbuild/client5/client5.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -98,6 +99,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/logger/msbuild/client5/packages.config +++ b/cpp/test/Ice/logger/msbuild/client5/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 dbae4004583..ff2b56c5e13 100644 --- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -354,5 +356,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/metrics/msbuild/client/packages.config +++ b/cpp/test/Ice/metrics/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 2229faf74d4..1ea76f7e54f 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -356,5 +358,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/metrics/msbuild/collocated/packages.config +++ b/cpp/test/Ice/metrics/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/metrics/msbuild/server/packages.config +++ b/cpp/test/Ice/metrics/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 2963d7fb727..8a9591500e2 100644 --- a/cpp/test/Ice/metrics/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/metrics/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 088951fe6a7..591655e1109 100644 --- a/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj index 13760433820..146b45524a5 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -266,6 +267,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/networkProxy/msbuild/client/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/packages.config +++ b/cpp/test/Ice/networkProxy/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 cf32f496824..40bd402b393 100644 --- a/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/networkProxy/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -265,6 +266,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +351,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index b47403572e3..5aa150b7a22 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -577,5 +577,30 @@ allTests(Test::TestHelper* helper) } cout << "ok" << endl; + cout << "testing forward declarations... " << flush; + { + F1Ptr f12; + F1Ptr f11 = initial->opF1(ICE_MAKE_SHARED(F1, "F11"), f12); + test(f11->name == "F11"); + test(f12->name == "F12"); + + F2PrxPtr f22; + F2PrxPtr f21 = initial->opF2(ICE_UNCHECKED_CAST(F2Prx, communicator->stringToProxy("F21")), f22); + test(f21->ice_getIdentity().name == "F21"); + test(f22->ice_getIdentity().name == "F22"); + + if(initial->hasF3()) + { + F3Ptr f32; + F3Ptr f31 = initial->opF3(ICE_MAKE_SHARED(F3, f11, f21), f32); + test(f31->f1->name == "F11"); + test(f31->f2->ice_getIdentity().name == "F21"); + + test(f32->f1->name == "F12"); + test(f32->f2->ice_getIdentity().name == "F22"); + } + } + cout << "ok" << endl; + return initial; } diff --git a/cpp/test/Ice/objects/Derived.ice b/cpp/test/Ice/objects/Derived.ice index 57c75cb5906..ff0a06a80aa 100644 --- a/cpp/test/Ice/objects/Derived.ice +++ b/cpp/test/Ice/objects/Derived.ice @@ -5,6 +5,7 @@ #pragma once #include <Test.ice> +#include <Forward.ice> module Test { diff --git a/cpp/test/Ice/objects/DerivedEx.ice b/cpp/test/Ice/objects/DerivedEx.ice index 49a06129a65..a265fde6b96 100644 --- a/cpp/test/Ice/objects/DerivedEx.ice +++ b/cpp/test/Ice/objects/DerivedEx.ice @@ -5,6 +5,7 @@ #pragma once #include <Test.ice> +#include <Forward.ice> module Test { diff --git a/cpp/test/Ice/objects/Forward.ice b/cpp/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..5cc93e83b4a --- /dev/null +++ b/cpp/test/Ice/objects/Forward.ice @@ -0,0 +1,20 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk index 2a5886d03dd..60c831d4c2f 100644 --- a/cpp/test/Ice/objects/Makefile.mk +++ b/cpp/test/Ice/objects/Makefile.mk @@ -3,8 +3,8 @@ # $(test)_sliceflags := -I$(test) -$(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp -$(test)_server_sources = Server.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp -$(test)_collocated_sources = Collocated.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp +$(test)_client_sources = Client.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp +$(test)_server_sources = Server.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp +$(test)_collocated_sources = Collocated.cpp Forward.ice Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp tests += $(test) diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice index f019333c638..38214e39951 100644 --- a/cpp/test/Ice/objects/Test.ice +++ b/cpp/test/Ice/objects/Test.ice @@ -6,6 +6,8 @@ [["suppress-warning:deprecated"]] // For classes with operations +[["cpp:source-include:Forward.h"]] + module Test { @@ -198,6 +200,15 @@ class M LMap v; } +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + interface Initial { void shutdown(); @@ -242,6 +253,11 @@ interface Initial void throwInnerSubEx() throws Inner::Sub::Ex; M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + bool hasF3(); + F3 opF3(F3 f31, out F3 f32); } interface TestIntf diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index df86685aa88..9cfd4c395eb 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -388,3 +388,32 @@ UnexpectedObjectExceptionTestI::ice_invoke(ICE_IN(std::vector<Ice::Byte>), out.finished(outParams); return true; } + +Test::F1Ptr +InitialI::opF1(ICE_IN(Test::F1Ptr) f11, Test::F1Ptr& f12, const Ice::Current&) +{ + f12 = ICE_MAKE_SHARED(F1, "F12"); + return f11; +} + +Test::F2PrxPtr +InitialI::opF2(ICE_IN(Test::F2PrxPtr) f21, Test::F2PrxPtr& f22, const Ice::Current& current) +{ + f22 = ICE_UNCHECKED_CAST(F2Prx, current.adapter->getCommunicator()->stringToProxy("F22")); + return f21; +} + +Test::F3Ptr +InitialI::opF3(ICE_IN(Test::F3Ptr) f31, Test::F3Ptr& f32, const Ice::Current& current) +{ + f32 = ICE_MAKE_SHARED(F3); + f32->f1 = ICE_MAKE_SHARED(F1, "F12"); + f32->f2 = ICE_UNCHECKED_CAST(F2Prx, current.adapter->getCommunicator()->stringToProxy("F22")); + return f31; +} + +bool +InitialI::hasF3(const Ice::Current&) +{ + return true; +} diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h index 4a55bb337f6..ee6ef9e19fd 100644 --- a/cpp/test/Ice/objects/TestI.h +++ b/cpp/test/Ice/objects/TestI.h @@ -6,6 +6,7 @@ #define TEST_I_H #include <Test.h> +#include <Forward.h> class BI : public Test::B { @@ -142,6 +143,11 @@ public: virtual Test::MPtr opM(ICE_IN(Test::MPtr), Test::MPtr&, const Ice::Current&); + virtual Test::F1Ptr opF1(ICE_IN(Test::F1Ptr), Test::F1Ptr&, const Ice::Current&); + virtual Test::F2PrxPtr opF2(ICE_IN(Test::F2PrxPtr), Test::F2PrxPtr&, const Ice::Current&); + virtual Test::F3Ptr opF3(ICE_IN(Test::F3Ptr), Test::F3Ptr&, const Ice::Current&); + virtual bool hasF3(const Ice::Current&); + private: Ice::ObjectAdapterPtr _adapter; diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/client/client.vcxproj index a56437ce431..f400cb04677 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -229,6 +231,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Cpp11-Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Cpp11-Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -259,6 +271,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -289,6 +311,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -319,6 +351,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -349,6 +391,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Cpp11-Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -379,6 +431,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Cpp11-Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -409,6 +471,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -439,6 +511,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -472,6 +554,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Cpp11-Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Cpp11-Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -502,6 +594,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Cpp11-Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -532,6 +634,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -562,6 +674,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -592,6 +714,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Cpp11-Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Cpp11-Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -622,6 +754,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Cpp11-Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -652,6 +794,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -682,6 +834,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -696,6 +858,7 @@ <ItemGroup> <SliceCompile Include="..\..\Derived.ice" /> <SliceCompile Include="..\..\DerivedEx.ice" /> + <SliceCompile Include="..\..\Forward.ice" /> <SliceCompile Include="..\..\Test.ice" /> </ItemGroup> <ItemGroup> @@ -716,5 +879,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters index 6fe8c625fe2..6324d2645df 100644 --- a/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters +++ b/cpp/test/Ice/objects/msbuild/client/client.vcxproj.filters @@ -82,6 +82,30 @@ <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> <Filter>Source Files\Win32\Cpp11-Release</Filter> </ClCompile> + <ClCompile Include="Win32\Cpp11-Debug\Forward.cpp"> + <Filter>Source Files\Win32\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Forward.cpp"> + <Filter>Source Files\x64\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Forward.cpp"> + <Filter>Source Files\Win32\Cpp11-Release</Filter> + </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Forward.cpp"> + <Filter>Source Files\x64\Cpp11-Release</Filter> + </ClCompile> + <ClCompile Include="Win32\Debug\Forward.cpp"> + <Filter>Source Files\Win32\Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Debug\Forward.cpp"> + <Filter>Source Files\x64\Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Release\Forward.cpp"> + <Filter>Source Files\Win32\Release</Filter> + </ClCompile> + <ClCompile Include="x64\Release\Forward.cpp"> + <Filter>Source Files\x64\Release</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="Header Files"> @@ -231,6 +255,30 @@ <ClInclude Include="Win32\Cpp11-Release\Test.h"> <Filter>Header Files\Win32\Cpp11-Release</Filter> </ClInclude> + <ClInclude Include="Win32\Cpp11-Debug\Forward.h"> + <Filter>Header Files\Win32\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Cpp11-Debug\Forward.h"> + <Filter>Header Files\x64\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Forward.h"> + <Filter>Header Files\Win32\Cpp11-Release</Filter> + </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Forward.h"> + <Filter>Header Files\x64\Cpp11-Release</Filter> + </ClInclude> + <ClInclude Include="Win32\Debug\Forward.h"> + <Filter>Header Files\Win32\Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Debug\Forward.h"> + <Filter>Header Files\x64\Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Release\Forward.h"> + <Filter>Header Files\Win32\Release</Filter> + </ClInclude> + <ClInclude Include="x64\Release\Forward.h"> + <Filter>Header Files\x64\Release</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="packages.config" /> @@ -245,5 +293,8 @@ <SliceCompile Include="..\..\Test.ice"> <Filter>Slice Files</Filter> </SliceCompile> + <SliceCompile Include="..\..\Forward.ice"> + <Filter>Slice Files</Filter> + </SliceCompile> </ItemGroup> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/objects/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 c1eaef68f52..9aa2d6c5d9f 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -222,6 +224,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Cpp11-Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Cpp11-Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -252,6 +264,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -282,6 +304,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -312,6 +344,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -342,6 +384,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Cpp11-Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -372,6 +424,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Cpp11-Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -402,6 +464,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -432,6 +504,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -465,6 +547,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Cpp11-Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Cpp11-Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -495,6 +587,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Cpp11-Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -525,6 +627,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -555,6 +667,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -585,6 +707,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Cpp11-Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Cpp11-Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -615,6 +747,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Cpp11-Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -645,6 +787,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -675,6 +827,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -689,6 +851,7 @@ <ItemGroup> <SliceCompile Include="..\..\Derived.ice" /> <SliceCompile Include="..\..\DerivedEx.ice" /> + <SliceCompile Include="..\..\Forward.ice" /> <SliceCompile Include="..\..\Test.ice" /> </ItemGroup> <ItemGroup> @@ -709,5 +872,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters index 9600a8c0904..07aaa1171a2 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters +++ b/cpp/test/Ice/objects/msbuild/collocated/collocated.vcxproj.filters @@ -85,6 +85,30 @@ <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> <Filter>Source Files\Win32\Cpp11-Release</Filter> </ClCompile> + <ClCompile Include="Win32\Cpp11-Debug\Forward.cpp"> + <Filter>Source Files\Win32\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Forward.cpp"> + <Filter>Source Files\x64\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Forward.cpp"> + <Filter>Source Files\Win32\Cpp11-Release</Filter> + </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Forward.cpp"> + <Filter>Source Files\x64\Cpp11-Release</Filter> + </ClCompile> + <ClCompile Include="Win32\Debug\Forward.cpp"> + <Filter>Source Files\Win32\Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Debug\Forward.cpp"> + <Filter>Source Files\x64\Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Release\Forward.cpp"> + <Filter>Source Files\Win32\Release</Filter> + </ClCompile> + <ClCompile Include="x64\Release\Forward.cpp"> + <Filter>Source Files\x64\Release</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <Filter Include="Slice Files"> @@ -234,6 +258,30 @@ <ClInclude Include="Win32\Cpp11-Release\Test.h"> <Filter>Header Files\Win32\Cpp11-Release</Filter> </ClInclude> + <ClInclude Include="Win32\Cpp11-Debug\Forward.h"> + <Filter>Header Files\Win32\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Cpp11-Debug\Forward.h"> + <Filter>Header Files\x64\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Forward.h"> + <Filter>Header Files\Win32\Cpp11-Release</Filter> + </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Forward.h"> + <Filter>Header Files\x64\Cpp11-Release</Filter> + </ClInclude> + <ClInclude Include="Win32\Debug\Forward.h"> + <Filter>Header Files\Win32\Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Debug\Forward.h"> + <Filter>Header Files\x64\Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Release\Forward.h"> + <Filter>Header Files\Win32\Release</Filter> + </ClInclude> + <ClInclude Include="x64\Release\Forward.h"> + <Filter>Header Files\x64\Release</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="packages.config" /> @@ -248,5 +296,8 @@ <SliceCompile Include="..\..\Test.ice"> <Filter>Slice Files</Filter> </SliceCompile> + <SliceCompile Include="..\..\Forward.ice"> + <Filter>Slice Files</Filter> + </SliceCompile> </ItemGroup> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/objects/msbuild/collocated/packages.config +++ b/cpp/test/Ice/objects/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/objects/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 153368e6f50..7ef708b0141 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -221,6 +223,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Cpp11-Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Cpp11-Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -251,6 +263,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -281,6 +303,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -311,6 +343,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="Win32\Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="Win32\Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -341,6 +383,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Cpp11-Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -371,6 +423,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Cpp11-Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -401,6 +463,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Debug\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Debug\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -431,6 +503,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClCompile> + <ClCompile Include="x64\Release\Forward.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClCompile> <ClCompile Include="x64\Release\Test.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -464,6 +546,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Cpp11-Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Cpp11-Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -494,6 +586,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Cpp11-Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -524,6 +626,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -554,6 +666,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="Win32\Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="Win32\Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -584,6 +706,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Cpp11-Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Cpp11-Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -614,6 +746,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Cpp11-Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -644,6 +786,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Debug\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Debug\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -674,6 +826,16 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\DerivedEx.ice</SliceCompileSource> </ClInclude> + <ClInclude Include="x64\Release\Forward.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <SliceCompileSource>..\..\Forward.ice</SliceCompileSource> + </ClInclude> <ClInclude Include="x64\Release\Test.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -688,6 +850,7 @@ <ItemGroup> <SliceCompile Include="..\..\Derived.ice" /> <SliceCompile Include="..\..\DerivedEx.ice" /> + <SliceCompile Include="..\..\Forward.ice" /> <SliceCompile Include="..\..\Test.ice" /> </ItemGroup> <ItemGroup> @@ -708,5 +871,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters index 1544fcecac1..58603f07cde 100644 --- a/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters +++ b/cpp/test/Ice/objects/msbuild/server/server.vcxproj.filters @@ -154,6 +154,30 @@ <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> <Filter>Source Files\Win32\Cpp11-Release</Filter> </ClCompile> + <ClCompile Include="Win32\Cpp11-Debug\Forward.cpp"> + <Filter>Source Files\Win32\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Forward.cpp"> + <Filter>Source Files\x64\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Forward.cpp"> + <Filter>Source Files\Win32\Cpp11-Release</Filter> + </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Forward.cpp"> + <Filter>Source Files\x64\Cpp11-Release</Filter> + </ClCompile> + <ClCompile Include="Win32\Debug\Forward.cpp"> + <Filter>Source Files\Win32\Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Debug\Forward.cpp"> + <Filter>Source Files\x64\Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Release\Forward.cpp"> + <Filter>Source Files\Win32\Release</Filter> + </ClCompile> + <ClCompile Include="x64\Release\Forward.cpp"> + <Filter>Source Files\x64\Release</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\TestI.h"> @@ -231,6 +255,30 @@ <ClInclude Include="Win32\Cpp11-Release\Test.h"> <Filter>Header Files\Win32\Cpp11-Release</Filter> </ClInclude> + <ClInclude Include="Win32\Cpp11-Debug\Forward.h"> + <Filter>Header Files\Win32\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Cpp11-Debug\Forward.h"> + <Filter>Header Files\x64\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Forward.h"> + <Filter>Header Files\Win32\Cpp11-Release</Filter> + </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Forward.h"> + <Filter>Header Files\x64\Cpp11-Release</Filter> + </ClInclude> + <ClInclude Include="Win32\Debug\Forward.h"> + <Filter>Header Files\Win32\Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Debug\Forward.h"> + <Filter>Header Files\x64\Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Release\Forward.h"> + <Filter>Header Files\Win32\Release</Filter> + </ClInclude> + <ClInclude Include="x64\Release\Forward.h"> + <Filter>Header Files\x64\Release</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="packages.config" /> @@ -245,5 +293,8 @@ <SliceCompile Include="..\..\Test.ice"> <Filter>Slice Files</Filter> </SliceCompile> + <SliceCompile Include="..\..\Forward.ice"> + <Filter>Slice Files</Filter> + </SliceCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj index 33470a98e8b..8ebedbd6523 100644 --- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -356,5 +358,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/operations/msbuild/client/packages.config +++ b/cpp/test/Ice/operations/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 aecdaa9c5e5..e044ec2c2e4 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -366,5 +368,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/operations/msbuild/collocated/packages.config +++ b/cpp/test/Ice/operations/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/operations/msbuild/server/packages.config +++ b/cpp/test/Ice/operations/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 cf18ba75163..dcbd1b71067 100644 --- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -359,5 +361,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/operations/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7f8280fdd36..88163a1b50d 100644 --- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -359,5 +361,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/optional/msbuild/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/client/client.vcxproj index 184fabb9b89..3c048d66248 100644 --- a/cpp/test/Ice/optional/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/optional/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -355,5 +357,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/optional/msbuild/client/packages.config +++ b/cpp/test/Ice/optional/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/optional/msbuild/server/packages.config +++ b/cpp/test/Ice/optional/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 f4fdfaf4ab7..c801ef5d218 100644 --- a/cpp/test/Ice/optional/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/optional/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -355,5 +357,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/optional/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 a048859f715..93847cf939e 100644 --- a/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/optional/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -355,5 +357,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj index 687228c31cc..b53892fefde 100644 --- a/cpp/test/Ice/plugin/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -98,6 +99,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -142,5 +144,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> -</Project> +</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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/plugin/msbuild/client/packages.config +++ b/cpp/test/Ice/plugin/msbuild/client/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/packages.config +++ b/cpp/test/Ice/plugin/msbuild/testplugin/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 f75266a1dcf..4b75544d985 100644 --- a/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj +++ b/cpp/test/Ice/plugin/msbuild/testplugin/testplugin.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -98,6 +99,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 5a82a9e24a8..ec7417ec06d 100644 --- a/cpp/test/Ice/properties/msbuild/client.vcxproj +++ b/cpp/test/Ice/properties/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/Ice/properties/msbuild/packages.config +++ b/cpp/test/Ice/properties/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 c6aee63c4ed..6a357db4227 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/proxy/msbuild/client/packages.config +++ b/cpp/test/Ice/proxy/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 959a162c944..1c4949487c7 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/packages.config +++ b/cpp/test/Ice/proxy/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/proxy/msbuild/server/packages.config +++ b/cpp/test/Ice/proxy/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 842e3300d22..61d93e0daa8 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/proxy/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 1a776a4ea1c..db8d6d7a240 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/client/client.vcxproj index 1ae38b1b9f2..96c699ada1d 100644 --- a/cpp/test/Ice/retry/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/retry/msbuild/client/packages.config +++ b/cpp/test/Ice/retry/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 35867d9cd45..2d88389fd95 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -354,5 +356,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/retry/msbuild/collocated/packages.config +++ b/cpp/test/Ice/retry/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/retry/msbuild/server/packages.config +++ b/cpp/test/Ice/retry/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 11c893fe2e6..fca97179908 100644 --- a/cpp/test/Ice/retry/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -354,5 +356,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/scope/msbuild/client/client.vcxproj b/cpp/test/Ice/scope/msbuild/client/client.vcxproj index b1eb57e014c..80cd83ebba6 100644 --- a/cpp/test/Ice/scope/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/scope/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/scope/msbuild/client/packages.config +++ b/cpp/test/Ice/scope/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/scope/msbuild/server/packages.config +++ b/cpp/test/Ice/scope/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 a7579dd094a..16eb4d0a8f1 100644 --- a/cpp/test/Ice/scope/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/scope/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +360,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj index 5fd81455cc9..00b931c1a4a 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/servantLocator/msbuild/client/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 4397be28316..fd78447846a 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/collocated.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -354,5 +356,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/collocated/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 894503a1daa..a1a5fd49804 100644 --- a/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +355,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 ff2afcab2a7..61b599f94d4 100644 --- a/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/servantLocator/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -361,5 +363,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/services/msbuild/client.vcxproj b/cpp/test/Ice/services/msbuild/client.vcxproj index fdfcc9f7a49..758630b73e3 100644 --- a/cpp/test/Ice/services/msbuild/client.vcxproj +++ b/cpp/test/Ice/services/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +360,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/services/msbuild/packages.config +++ b/cpp/test/Ice/services/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 9b1eac073ba..24336d495f3 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -473,5 +475,7 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 506fd9e2d5b..41bfe8bc1f1 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -514,5 +516,7 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 01327f80cc1..682fe2f871d 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -514,5 +516,7 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj index 052a9582031..9dc651b6e28 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -473,5 +475,7 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/client/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 cbe8d8d7943..5ce780a4c2a 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -514,5 +516,7 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 ec79bd43931..0115a0c7e9e 100644 --- a/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -514,5 +516,7 @@ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/stream/msbuild/client.vcxproj b/cpp/test/Ice/stream/msbuild/client.vcxproj index fc703573f0c..b805deaa566 100644 --- a/cpp/test/Ice/stream/msbuild/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -333,5 +335,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/stream/msbuild/packages.config +++ b/cpp/test/Ice/stream/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 bddd5eda38a..5b26767766c 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -309,5 +311,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/stringConverter/msbuild/client/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/packages.config +++ b/cpp/test/Ice/stringConverter/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 ef12dfa25bd..3ccc1ad21e8 100644 --- a/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/stringConverter/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +351,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj index 23c78d24721..49da7988aa9 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7640fddba48..9dda8eb97ff 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 001122dd492..7f8029e91ea 100644 --- a/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj +++ b/cpp/test/Ice/threadPoolPriority/msbuild/servercustom/servercustom.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 f34d8557b7f..8499e3c3169 100644 --- a/cpp/test/Ice/timeout/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +354,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/timeout/msbuild/client/packages.config +++ b/cpp/test/Ice/timeout/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/timeout/msbuild/server/packages.config +++ b/cpp/test/Ice/timeout/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 68082affef8..c830293232d 100644 --- a/cpp/test/Ice/timeout/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/client/client.vcxproj index 05e6e511aee..e6a0ff5cc71 100644 --- a/cpp/test/Ice/udp/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/udp/msbuild/client/packages.config +++ b/cpp/test/Ice/udp/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Ice/udp/msbuild/server/packages.config +++ b/cpp/test/Ice/udp/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 2ccbcba7286..52be6c5af1a 100644 --- a/cpp/test/Ice/udp/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj index 78a4704dfba..b290f4b8bfe 100644 --- a/cpp/test/IceBox/admin/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceBox/admin/msbuild/client/packages.config +++ b/cpp/test/IceBox/admin/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/admin/msbuild/testservice/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 9d2cec0e005..29aa911f46b 100644 --- a/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/admin/msbuild/testservice/testservice.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -267,6 +268,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -375,5 +377,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 11fe9b111fb..897c60b1dd2 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceBox/configuration/msbuild/client/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/packages.config +++ b/cpp/test/IceBox/configuration/msbuild/testservice/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 e9fefeb3e46..fa357c05ae5 100644 --- a/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceBox/configuration/msbuild/testservice/testservice.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -267,6 +268,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -375,5 +377,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 694d0d5df97..fc329d87000 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -310,5 +312,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceBridge/simple/msbuild/client/packages.config +++ b/cpp/test/IceBridge/simple/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/packages.config +++ b/cpp/test/IceBridge/simple/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 b81502ba5eb..0ccc0c18871 100644 --- a/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceBridge/simple/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -354,5 +356,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 c02abd047b2..b6115627941 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -334,5 +336,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/client/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/packages.config +++ b/cpp/test/IceDiscovery/simple/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7787b31a3b7..a71c8a51da0 100644 --- a/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceDiscovery/simple/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -359,5 +361,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 9036a3913ae..39c470f02e8 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/activation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/activation/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 11c1ae5d496..323e09d8682 100644 --- a/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/activation/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 ba5d95c3df8..3c0f2a22ca2 100644 --- a/cpp/test/IceGrid/admin/msbuild/packages.config +++ b/cpp/test/IceGrid/admin/msbuild/packages.config @@ -3,4 +3,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 736f196c2de..e8e2942e38c 100644 --- a/cpp/test/IceGrid/admin/msbuild/server.vcxproj +++ b/cpp/test/IceGrid/admin/msbuild/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -93,6 +94,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -170,5 +172,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 f741ea80233..e400543b9c0 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/allocation/msbuild/client/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 744d849fb3b..587051219f1 100644 --- a/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 ba5d95c3df8..3c0f2a22ca2 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/packages.config @@ -3,4 +3,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 74f006fc004..e67c96d5ae4 100644 --- a/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/allocation/msbuild/verifier/verifier.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -87,6 +88,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -170,5 +172,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 ace85f4880f..d965fe57abf 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/deployer/msbuild/client/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 2f114cb157d..4c9e808e7cc 100644 --- a/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 599c5c5202c..61515bfeef2 100644 --- a/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/deployer/msbuild/testservice/testservice.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -368,5 +370,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 e3e0b8287b8..b94bfd00f38 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/distribution/msbuild/client/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/packages.config +++ b/cpp/test/IceGrid/distribution/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 e1a32ac6b21..b9945c47d6d 100644 --- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 598aaa744ec..b886c88296c 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f4cc961688..187eac9b7cb 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6717d9e6972..9ae8b97beb8 100644 --- a/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/noRestartUpdate/msbuild/testservice/testservice.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -368,5 +370,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 af8614f3fbb..391e6bfde1b 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 ba5d95c3df8..3c0f2a22ca2 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/packages.config @@ -3,4 +3,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 5be99ffecea..bd7c3b92610 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/registryplugin/registryplugin.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -93,6 +94,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -170,5 +172,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7d8a16bc63f..652d0afcc37 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 c29c8260738..4a68a3f1d4e 100644 --- a/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj +++ b/cpp/test/IceGrid/replicaGroup/msbuild/testservice/testservice.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -368,5 +370,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 d558c0b4a19..b547295156e 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/replication/msbuild/client/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/packages.config +++ b/cpp/test/IceGrid/replication/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 70ff4dc57db..4df58d63022 100644 --- a/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/replication/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 db301d4058d..8cbf2ced702 100644 --- a/cpp/test/IceGrid/session/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +305,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/session/msbuild/client/packages.config +++ b/cpp/test/IceGrid/session/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/session/msbuild/server/packages.config +++ b/cpp/test/IceGrid/session/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 9718edefc8d..832ae9107be 100644 --- a/cpp/test/IceGrid/session/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/packages.config +++ b/cpp/test/IceGrid/session/msbuild/verifier/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 2d3e23f79e2..df684ebb171 100644 --- a/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj +++ b/cpp/test/IceGrid/session/msbuild/verifier/verifier.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 5b339008a30..582b3f58bbf 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/simple/msbuild/client/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/packages.config +++ b/cpp/test/IceGrid/simple/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 f30a3d7818e..9319aaf72c8 100644 --- a/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/simple/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 dd3d49eec9b..1d10a5f7ca1 100644 --- a/cpp/test/IceGrid/update/msbuild/client/client.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -327,5 +329,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/update/msbuild/client/packages.config +++ b/cpp/test/IceGrid/update/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceGrid/update/msbuild/server/packages.config +++ b/cpp/test/IceGrid/update/msbuild/server/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 1e1ffb2218d..85237eeae64 100644 --- a/cpp/test/IceGrid/update/msbuild/server/server.vcxproj +++ b/cpp/test/IceGrid/update/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -89,6 +90,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +346,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 2fcba33ecb1..bd3d2ea6d8d 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -4235,7 +4235,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) initData.properties->setProperty("IceSSL.Protocols", "TLS1_0,TLS1_1"); # endif CommunicatorPtr comm = initialize(initData); - Ice::ObjectPrxPtr p = comm->stringToProxy("Glacier2/router:wss -h demo.zeroc.com -p 5064"); + Ice::ObjectPrxPtr p = comm->stringToProxy("Glacier2/router:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try @@ -4285,7 +4285,7 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) initData.properties->setProperty("IceSSL.Protocols", "TLS1_0,TLS1_1"); # endif CommunicatorPtr comm = initialize(initData); - Ice::ObjectPrxPtr p = comm->stringToProxy("Glacier2/router:wss -h demo.zeroc.com -p 5064"); + Ice::ObjectPrxPtr p = comm->stringToProxy("Glacier2/router:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try diff --git a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj index 11af4405d72..488332f378b 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +352,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceSSL/configuration/msbuild/client/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/client/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/server/packages.config b/cpp/test/IceSSL/configuration/msbuild/server/packages.config index 90f226456dc..69ce541bd15 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/server/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 26e783509eb..c89a654c565 100644 --- a/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/server/server.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +353,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </Target> </Project>
\ 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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/publisher/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 56526a45aee..84495a1661b 100644 --- a/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/publisher/publisher.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +304,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 52ac75d8c95..92a6f3eff03 100644 --- a/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation/msbuild/subscriber/subscriber.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 289e201aec1..557243a137b 100644 --- a/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/publisher/publisher.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +304,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 fee09d0344f..18a1a73ddbe 100644 --- a/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/federation2/msbuild/subscriber/subscriber.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 21418108900..63c01617d95 100644 --- a/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj +++ b/cpp/test/IceStorm/persistent/msbuild/client/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -95,6 +96,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -137,5 +139,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/persistent/msbuild/client/packages.config +++ b/cpp/test/IceStorm/persistent/msbuild/client/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 dfc4aac417b..dea2a85bfa7 100644 --- a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +304,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/sub/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 63df0bb261c..e75b0afb342 100644 --- a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 b3927ed570e..82f2b971670 100644 --- a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 0af3a33774a..da53cdf4028 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj +++ b/cpp/test/IceStorm/repgrid/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +304,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/repgrid/msbuild/packages.config +++ b/cpp/test/IceStorm/repgrid/msbuild/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7b553cbb482..94e39315351 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/control/control.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -421,6 +422,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +505,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/repstress/msbuild/control/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/control/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 d7aceed959b..187bffefd05 100644 --- a/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/publisher/publisher.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -421,6 +422,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -463,5 +465,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 3926177aab7..abbbead5969 100644 --- a/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/repstress/msbuild/subscriber/subscriber.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -421,6 +422,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +505,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/single/msbuild/publisher/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 7b6e2f07cc1..4556b45becb 100644 --- a/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/publisher/publisher.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +304,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/single/msbuild/subscriber/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 d5c0d5ac7d1..2ae48cbbd15 100644 --- a/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/single/msbuild/subscriber/subscriber.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/publisher/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 a152d1c2f73..fd6221bf914 100644 --- a/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/publisher/publisher.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +304,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 6f18c4c7626..89544b222fd 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/packages.config @@ -3,5 +3,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 c439f452b3f..6fdfb1b1fe2 100644 --- a/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj +++ b/cpp/test/IceStorm/stress/msbuild/subscriber/subscriber.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -260,6 +261,7 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +344,7 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 b9e674652b3..c40835cd018 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config +++ b/cpp/test/IceUtil/ctrlCHandler/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 3ec70a0df07..f3a30b9e4ba 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/inputUtil/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/inputUtil/msbuild/packages.config +++ b/cpp/test/IceUtil/inputUtil/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 5c4e47b8192..4d5a14105e3 100644 --- a/cpp/test/IceUtil/priority/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/priority/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -189,5 +191,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/priority/msbuild/packages.config +++ b/cpp/test/IceUtil/priority/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 1fc1fb67466..f989366f100 100644 --- a/cpp/test/IceUtil/sha1/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/sha1/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/sha1/msbuild/packages.config +++ b/cpp/test/IceUtil/sha1/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj index 5de059ce8fd..10db887daa9 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/stacktrace/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -219,5 +221,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/stacktrace/msbuild/packages.config +++ b/cpp/test/IceUtil/stacktrace/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 433c2c1f8bf..e22ed8b0ee3 100644 --- a/cpp/test/IceUtil/thread/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/thread/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -201,5 +203,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/thread/msbuild/packages.config +++ b/cpp/test/IceUtil/thread/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 49631cd557b..24085c6f157 100644 --- a/cpp/test/IceUtil/timer/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/timer/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/timer/msbuild/packages.config +++ b/cpp/test/IceUtil/timer/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 aeaf76d3964..f511aa90ac4 100644 --- a/cpp/test/IceUtil/unicode/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/unicode/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/unicode/msbuild/packages.config +++ b/cpp/test/IceUtil/unicode/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 6850089e34d..e78552b9adc 100644 --- a/cpp/test/IceUtil/uuid/msbuild/client.vcxproj +++ b/cpp/test/IceUtil/uuid/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -92,6 +93,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.2\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -177,5 +179,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') )" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') )" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 84ed779482b..19c8e4006e3 100644 --- a/cpp/test/IceUtil/uuid/msbuild/packages.config +++ b/cpp/test/IceUtil/uuid/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> </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 1f1064007e7..48672c04f17 100644 --- a/cpp/test/Slice/escape/msbuild/client.vcxproj +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +512,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Slice/escape/msbuild/packages.config +++ b/cpp/test/Slice/escape/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 24d12a29960..4037da04bd6 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +351,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Slice/macros/msbuild/packages.config +++ b/cpp/test/Slice/macros/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/Slice/parser/Makefile.mk b/cpp/test/Slice/parser/Makefile.mk new file mode 100644 index 00000000000..c46cfbb48ab --- /dev/null +++ b/cpp/test/Slice/parser/Makefile.mk @@ -0,0 +1,9 @@ +# +# Copyright (c) ZeroC, Inc. All rights reserved. +# + +$(test)_libraries := SliceParser + +$(test)_sliceflags := -I$(test) + +tests += $(test) diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index b0812404057..c582e8f1709 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -425,6 +426,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +513,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Slice/parser/msbuild/packages.config +++ b/cpp/test/Slice/parser/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 e61623d12d4..b6cff1c4e27 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj +++ b/cpp/test/Slice/structure/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +351,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Slice/structure/msbuild/packages.config +++ b/cpp/test/Slice/structure/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.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 5728c1a8cef..2a5189fb8b6 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.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.2\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> @@ -94,6 +95,7 @@ <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.2\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="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,5 +350,7 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.2\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.2\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.props'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.2\build\native\zeroc.ice.v142.targets'))" /> </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 90f226456dc..69ce541bd15 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/packages.config +++ b/cpp/test/Slice/utf8BOM/msbuild/packages.config @@ -4,5 +4,6 @@ <package id="zeroc.ice.v120" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.2" targetFramework="native" /> <package id="zeroc.ice.v141" version="3.7.2" targetFramework="native" /> + <package id="zeroc.ice.v142" version="3.7.2" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/csharp/src/Ice/BZip2.cs b/csharp/src/Ice/BZip2.cs index fced74d165d..438dcbe460b 100644 --- a/csharp/src/Ice/BZip2.cs +++ b/csharp/src/Ice/BZip2.cs @@ -32,24 +32,44 @@ namespace IceInternal int verbosity); [DllImport("libbz2.so.1", EntryPoint="BZ2_bzlibVersion", ExactSpelling=true)] - internal static extern IntPtr unixBZ2_bzlibVersion(); + internal static extern IntPtr unixBZ2_1_bzlibVersion(); [DllImport("libbz2.so.1", EntryPoint="BZ2_bzBuffToBuffCompress", ExactSpelling=true)] - internal static extern int unixBZ2_bzBuffToBuffCompress(byte[] dest, - ref int destLen, - byte[] source, - int sourceLen, - int blockSize100k, - int verbosity, - int workFactor); - - [DllImport("libbz2.so.1", EntryPoint="BZ2_bzBuffToBuffDecompress", ExactSpelling=true)] - internal static extern int unixBZ2_bzBuffToBuffDecompress(byte[] dest, + internal static extern int unixBZ2_1_bzBuffToBuffCompress(byte[] dest, ref int destLen, byte[] source, int sourceLen, - int small, - int verbosity); + int blockSize100k, + int verbosity, + int workFactor); + + [DllImport("libbz2.so.1", EntryPoint="BZ2_bzBuffToBuffDecompress", ExactSpelling=true)] + internal static extern int unixBZ2_1_bzBuffToBuffDecompress(byte[] dest, + ref int destLen, + byte[] source, + int sourceLen, + int small, + int verbosity); + + [DllImport("libbz2.so.1.0", EntryPoint="BZ2_bzlibVersion", ExactSpelling=true)] + internal static extern IntPtr unixBZ2_10_bzlibVersion(); + + [DllImport("libbz2.so.1.0", EntryPoint="BZ2_bzBuffToBuffCompress", ExactSpelling=true)] + internal static extern int unixBZ2_10_bzBuffToBuffCompress(byte[] dest, + ref int destLen, + byte[] source, + int sourceLen, + int blockSize100k, + int verbosity, + int workFactor); + + [DllImport("libbz2.so.1.0", EntryPoint="BZ2_bzBuffToBuffDecompress", ExactSpelling=true)] + internal static extern int unixBZ2_10_bzBuffToBuffDecompress(byte[] dest, + ref int destLen, + byte[] source, + int sourceLen, + int small, + int verbosity); [DllImport("libbz2.dylib", EntryPoint="BZ2_bzlibVersion", ExactSpelling=true)] internal static extern IntPtr macOSBZ2_bzlibVersion(); @@ -95,6 +115,7 @@ namespace IceInternal // library. If we get an exception, the library is not available. // _bzlibInstalled = false; + _bzlibName = ""; // // We are setting the library name here because, under Mono, we don't know the exact library name. @@ -105,22 +126,32 @@ namespace IceInternal { if(AssemblyUtil.isWindows) { + _bzlibName = "bzip2.dll"; SafeNativeMethods.windowsBZ2_bzlibVersion(); } else if(AssemblyUtil.isMacOS) { + _bzlibName = "libbz2.dylib"; SafeNativeMethods.macOSBZ2_bzlibVersion(); } else { - SafeNativeMethods.unixBZ2_bzlibVersion(); + try + { + _bzlibName = "libbz2.so.1.0"; + SafeNativeMethods.unixBZ2_10_bzlibVersion(); + } + catch(TypeLoadException) + { + _bzlibName = "libbz2.so.1"; + SafeNativeMethods.unixBZ2_1_bzlibVersion(); + } } _bzlibInstalled = true; } catch(EntryPointNotFoundException) { - string lib = AssemblyUtil.isWindows ? "bzip2.dll" : "libbz2.so.1"; - Console.Error.WriteLine("warning: found " + lib + " but entry point BZ2_bzlibVersion is missing."); + Console.Error.WriteLine("warning: found " + _bzlibName + " but entry point BZ2_bzlibVersion is missing."); } catch(TypeLoadException) { @@ -128,7 +159,7 @@ namespace IceInternal } catch(BadImageFormatException ex) { - string lib = AssemblyUtil.isWindows ? "bzip2.dll" : "libbz2.so.1"; + string lib = _bzlibName; if(!String.IsNullOrEmpty(ex.FileName)) { lib = ex.FileName; // Future-proof: we'll do the right thing if the FileName member is non-empty. @@ -175,19 +206,40 @@ namespace IceInternal } else { - _compressBuffer = (byte[] dest, ref int destLen, byte[] source, int sourceLen, int blockSize100k, - int verbosity, int workFactor) => - { - return SafeNativeMethods.unixBZ2_bzBuffToBuffCompress(dest, ref destLen, source, sourceLen, - blockSize100k, verbosity, workFactor); - }; - - _decompressBuffer = (byte[] dest, ref int destLen, byte[] source, int sourceLen, int small, - int verbosity) => - { - return SafeNativeMethods.unixBZ2_bzBuffToBuffDecompress(dest, ref destLen, source, sourceLen, - small, verbosity); - }; + if(_bzlibName == "libbz2.so.1.0") + { + _compressBuffer = (byte[] dest, ref int destLen, byte[] source, int sourceLen, int blockSize100k, + int verbosity, int workFactor) => + { + return SafeNativeMethods.unixBZ2_10_bzBuffToBuffCompress(dest, ref destLen, source, + sourceLen, blockSize100k, + verbosity, workFactor); + }; + + _decompressBuffer = (byte[] dest, ref int destLen, byte[] source, int sourceLen, int small, + int verbosity) => + { + return SafeNativeMethods.unixBZ2_10_bzBuffToBuffDecompress(dest, ref destLen, source, + sourceLen, small, verbosity); + }; + } + else + { + _compressBuffer = (byte[] dest, ref int destLen, byte[] source, int sourceLen, int blockSize100k, + int verbosity, int workFactor) => + { + return SafeNativeMethods.unixBZ2_1_bzBuffToBuffCompress(dest, ref destLen, source, + sourceLen, blockSize100k, verbosity, + workFactor); + }; + + _decompressBuffer = (byte[] dest, ref int destLen, byte[] source, int sourceLen, int small, + int verbosity) => + { + return SafeNativeMethods.unixBZ2_1_bzBuffToBuffDecompress(dest, ref destLen, source, + sourceLen, small, verbosity); + }; + } } } @@ -354,6 +406,7 @@ namespace IceInternal } private static bool _bzlibInstalled; + private static string _bzlibName; private static CompressBuffer _compressBuffer; private static DecompressBuffer _decompressBuffer; diff --git a/csharp/test/Glacier2/router/CallbackI.cs b/csharp/test/Glacier2/router/CallbackI.cs index b1d2761293e..d5cef0f6666 100644 --- a/csharp/test/Glacier2/router/CallbackI.cs +++ b/csharp/test/Glacier2/router/CallbackI.cs @@ -65,7 +65,8 @@ public sealed class CallbackReceiverI : CallbackReceiverDisp_ { while(!_callback) { - System.Threading.Monitor.Wait(this); + System.Threading.Monitor.Wait(this, 30000); + TestHelper.test(_callback); } _callback = false; diff --git a/csharp/test/Ice/dispatcher/AllTests.cs b/csharp/test/Ice/dispatcher/AllTests.cs index ff9ee284ff3..7f032bd2d53 100644 --- a/csharp/test/Ice/dispatcher/AllTests.cs +++ b/csharp/test/Ice/dispatcher/AllTests.cs @@ -197,6 +197,9 @@ public class AllTests : Test.AllTests // Expect InvocationTimeoutException. // { + // The continuation might be (rarely) executed on the current thread if the setup of the + // continuation occurs after the invocation timeout. + var thread = Thread.CurrentThread; Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(20)); to.sleepAsync(500).ContinueWith( previous => @@ -209,7 +212,7 @@ public class AllTests : Test.AllTests catch(System.AggregateException ex) { test(ex.InnerException is Ice.InvocationTimeoutException); - test(Dispatcher.isDispatcherThread()); + test(Dispatcher.isDispatcherThread() || thread == Thread.CurrentThread); } }, TaskContinuationOptions.ExecuteSynchronously).Wait(); } diff --git a/csharp/test/Ice/objects/AllTests.cs b/csharp/test/Ice/objects/AllTests.cs index 150fb10fa64..9fc1caaa27e 100644 --- a/csharp/test/Ice/objects/AllTests.cs +++ b/csharp/test/Ice/objects/AllTests.cs @@ -505,6 +505,36 @@ namespace Ice } output.WriteLine("ok"); + + output.Write("testing forward declared types... "); + output.Flush(); + { + F1 f12; + F1 f11 = initial.opF1(new F1("F11"), out f12); + test(f11.name.Equals("F11")); + test(f12.name.Equals("F12")); + + F2Prx f22; + F2Prx f21 = initial.opF2(F2PrxHelper.uncheckedCast(communicator.stringToProxy("F21")), out f22); + test(f21.ice_getIdentity().name.Equals("F21")); + test(f22.ice_getIdentity().name.Equals("F22")); + + if(initial.hasF3()) + { + F3 f32; + F3 f31 = initial.opF3(new F3(new F1("F11"), + F2PrxHelper.uncheckedCast(communicator.stringToProxy("F21"))), + out f32); + + test(f31.f1.name.Equals("F11")); + test(f31.f2.ice_getIdentity().name.Equals("F21")); + + test(f32.f1.name.Equals("F12")); + test(f32.f2.ice_getIdentity().name.Equals("F22")); + } + } + output.WriteLine("ok"); + return initial; } } diff --git a/csharp/test/Ice/objects/Forward.ice b/csharp/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..423bc710140 --- /dev/null +++ b/csharp/test/Ice/objects/Forward.ice @@ -0,0 +1,23 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +[["cs:typeid-namespace:Ice.objects.TypeId"]] +["cs:namespace:Ice.objects"] + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/csharp/test/Ice/objects/InitialI.cs b/csharp/test/Ice/objects/InitialI.cs index 0967479718b..19e34a228d8 100644 --- a/csharp/test/Ice/objects/InitialI.cs +++ b/csharp/test/Ice/objects/InitialI.cs @@ -196,6 +196,34 @@ namespace Ice return v1; } + public override Test.F1 + opF1(Test.F1 f11, out Test.F1 f12, Ice.Current current) + { + f12 = new Test.F1("F12"); + return f11; + } + + public override Test.F2Prx + opF2(Test.F2Prx f21, out Test.F2Prx f22, Ice.Current current) + { + f22 = Test.F2PrxHelper.uncheckedCast(current.adapter.getCommunicator().stringToProxy("F22")); + return f21; + } + + public override Test.F3 + opF3(Test.F3 f31, out Test.F3 f32, Ice.Current current) + { + f32 = new Test.F3(new Test.F1("F12"), + Test.F2PrxHelper.uncheckedCast(current.adapter.getCommunicator().stringToProxy("F22"))); + return f31; + } + + public override bool + hasF3(Ice.Current current) + { + return true; + } + private Ice.ObjectAdapter _adapter; private Test.B _b1; private Test.B _b2; diff --git a/csharp/test/Ice/objects/Test.ice b/csharp/test/Ice/objects/Test.ice index 306d559f404..9fda575741c 100644 --- a/csharp/test/Ice/objects/Test.ice +++ b/csharp/test/Ice/objects/Test.ice @@ -193,6 +193,16 @@ class M LMap v; } +// Forward declarations +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + interface Initial { void shutdown(); @@ -238,6 +248,11 @@ interface Initial void throwInnerSubEx() throws Inner::Sub::Ex; M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } class Empty diff --git a/csharp/test/Ice/objects/msbuild/client/net45/client.csproj b/csharp/test/Ice/objects/msbuild/client/net45/client.csproj index 12b770689e1..495abce3637 100644 --- a/csharp/test/Ice/objects/msbuild/client/net45/client.csproj +++ b/csharp/test/Ice/objects/msbuild/client/net45/client.csproj @@ -67,6 +67,9 @@ <Compile Include="..\..\..\JI.cs"> <Link>JI.cs</Link> </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>..\..\..\Forward.ice</SliceCompileSource> + </Compile> <Compile Include="generated\Test.cs" /> </ItemGroup> <ItemGroup> @@ -76,6 +79,11 @@ </SliceCompile> <None Include="packages.config" /> </ItemGroup> + <ItemGroup> + <SliceCompile Include="..\..\..\Forward.ice"> + <Link>Forward.ice</Link> + </SliceCompile> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports"> diff --git a/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj index ebec7737dc3..408a9b5fc07 100644 --- a/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj +++ b/csharp/test/Ice/objects/msbuild/client/netstandard2.0/client.csproj @@ -24,8 +24,12 @@ <Compile Include="generated\Test.cs"> <SliceCompileSource>../../../Test.ice</SliceCompileSource> </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>../../../Forward.ice</SliceCompileSource> + </Compile> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Forward.ice" /> </ItemGroup> <Choose> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> diff --git a/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj b/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj index dbfe3eaff80..c1ab8738a7f 100644 --- a/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj +++ b/csharp/test/Ice/objects/msbuild/collocated/net45/collocated.csproj @@ -73,6 +73,9 @@ <Compile Include="..\..\..\UnexpectedObjectExceptionTestI.cs"> <Link>UnexpectedObjectExceptionTestI.cs</Link> </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>..\..\..\Forward.ice</SliceCompileSource> + </Compile> <Compile Include="generated\Test.cs" /> </ItemGroup> <ItemGroup> @@ -94,6 +97,11 @@ <Install>false</Install> </BootstrapperPackage> </ItemGroup> + <ItemGroup> + <SliceCompile Include="..\..\..\Forward.ice"> + <Link>Forward.ice</Link> + </SliceCompile> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports"> diff --git a/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj b/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj index 2219f7cef28..cc882ac2c0b 100644 --- a/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj +++ b/csharp/test/Ice/objects/msbuild/collocated/netstandard2.0/collocated.csproj @@ -26,8 +26,12 @@ <Compile Include="generated\Test.cs"> <SliceCompileSource>../../../Test.ice</SliceCompileSource> </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>../../../Forward.ice</SliceCompileSource> + </Compile> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Forward.ice" /> </ItemGroup> <Choose> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> diff --git a/csharp/test/Ice/objects/msbuild/server/net45/server.csproj b/csharp/test/Ice/objects/msbuild/server/net45/server.csproj index 3d843795aab..b699533dce7 100644 --- a/csharp/test/Ice/objects/msbuild/server/net45/server.csproj +++ b/csharp/test/Ice/objects/msbuild/server/net45/server.csproj @@ -70,6 +70,9 @@ <Compile Include="..\..\..\UnexpectedObjectExceptionTestI.cs"> <Link>UnexpectedObjectExceptionTestI.cs</Link> </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>..\..\..\Forward.ice</SliceCompileSource> + </Compile> <Compile Include="generated\Test.cs" /> </ItemGroup> <ItemGroup> @@ -79,6 +82,11 @@ <Link>Test.ice</Link> </SliceCompile> </ItemGroup> + <ItemGroup> + <SliceCompile Include="..\..\..\Forward.ice"> + <Link>Forward.ice</Link> + </SliceCompile> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports"> diff --git a/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj index 7629765bdad..515fd138ad4 100644 --- a/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj +++ b/csharp/test/Ice/objects/msbuild/server/netstandard2.0/server.csproj @@ -25,8 +25,12 @@ <Compile Include="generated\Test.cs"> <SliceCompileSource>../../../Test.ice</SliceCompileSource> </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>../../../Forward.ice</SliceCompileSource> + </Compile> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Forward.ice" /> </ItemGroup> <Choose> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> diff --git a/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj index 8b2f289e8e6..2ce4c0354db 100644 --- a/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj +++ b/csharp/test/Ice/objects/msbuild/test/netstandard2.0/test.csproj @@ -26,9 +26,13 @@ <Compile Include="generated\Test.cs"> <SliceCompileSource>../../../Test.ice</SliceCompileSource> </Compile> + <Compile Include="generated\Forward.cs"> + <SliceCompileSource>../../../Forward.ice</SliceCompileSource> + </Compile> <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.4" /> <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" /> <SliceCompile Include="../../../Test.ice" /> + <SliceCompile Include="../../../Forward.ice" /> </ItemGroup> <Choose> <When Condition="'$(ICE_BIN_DIST)' == 'all'"> diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs index 71e5954d952..f8d66796217 100644 --- a/csharp/test/IceSSL/configuration/AllTests.cs +++ b/csharp/test/IceSSL/configuration/AllTests.cs @@ -1199,6 +1199,10 @@ public class AllTests server.ice_ping(); //test(false); } + catch(Ice.SecurityException) + { + // Expected. + } catch(Ice.ConnectionLostException) { // Expected. @@ -1227,8 +1231,11 @@ public class AllTests } catch(Ice.LocalException ex) { - Console.WriteLine(ex.ToString()); - test(false); + if(ex.ToString().IndexOf("no protocols available") < 0) // Expected if TLS1.1 is disabled (RHEL8) + { + Console.WriteLine(ex.ToString()); + test(false); + } } fact.destroyServer(server); comm.destroy(); @@ -2390,13 +2397,16 @@ public class AllTests initData.properties.setProperty("IceSSL.DefaultDir", ""); initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout - // - // BUGFIX: SChannel TLS 1.2 bug that affects Windows versions prior to Windows 10 - // can cause SSL handshake errors when connecting to the remote zeroc server. - // - initData.properties.setProperty("IceSSL.Protocols", "TLS1_0,TLS1_1"); + if(IceInternal.AssemblyUtil.isWindows) + { + // + // BUGFIX: SChannel TLS 1.2 bug that affects Windows versions prior to Windows 10 + // can cause SSL handshake errors when connecting to the remote zeroc server. + // + initData.properties.setProperty("IceSSL.Protocols", "TLS1_0,TLS1_1"); + } Ice.Communicator comm = Ice.Util.initialize(initData); - Ice.ObjectPrx p = comm.stringToProxy("dummy:wss -h demo.zeroc.com -p 5064"); + Ice.ObjectPrx p = comm.stringToProxy("dummy:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try @@ -2437,13 +2447,16 @@ public class AllTests initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); - // - // BUGFIX: SChannel TLS 1.2 bug that affects Windows versions prior to Windows 10 - // can cause SSL handshake errors when connecting to the remote zeroc server. - // - initData.properties.setProperty("IceSSL.Protocols", "TLS1_0,TLS1_1"); + if(IceInternal.AssemblyUtil.isWindows) + { + // + // BUGFIX: SChannel TLS 1.2 bug that affects Windows versions prior to Windows 10 + // can cause SSL handshake errors when connecting to the remote zeroc server. + // + initData.properties.setProperty("IceSSL.Protocols", "TLS1_0,TLS1_1"); + } comm = Ice.Util.initialize(initData); - p = comm.stringToProxy("dummy:wss -h demo.zeroc.com -p 5064"); + p = comm.stringToProxy("dummy:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try diff --git a/csharp/test/TestCommon/TestHelper.cs b/csharp/test/TestCommon/TestHelper.cs index 57d2da9d046..b2c0d723c88 100644 --- a/csharp/test/TestCommon/TestHelper.cs +++ b/csharp/test/TestCommon/TestHelper.cs @@ -130,7 +130,7 @@ namespace Test return _communicator; } - protected static void test(bool b) + public static void test(bool b) { if (!b) { diff --git a/java-compat/test/android/controller/build.gradle b/java-compat/test/android/controller/build.gradle index ccf80496bda..e5b36a94a9c 100644 --- a/java-compat/test/android/controller/build.gradle +++ b/java-compat/test/android/controller/build.gradle @@ -92,9 +92,9 @@ clean { ext.localDependency = { artifactId -> if(project.slice.srcDist || System.env.ICE_BIN_DIST == "cpp") { - return ":${artifactId}-${project.slice.iceArtifactVersion}" + return ":${artifactId}-${project.iceVersion}" } else { - return "com.zeroc:${artifactId}:${project.version}" + return "com.zeroc:${artifactId}:${project.iceVersion}" } } diff --git a/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java b/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java index fec555fc288..f161d79dc22 100644 --- a/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java +++ b/java-compat/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java @@ -40,7 +40,8 @@ final class CallbackReceiverI extends _CallbackReceiverDisp { try { - wait(); + wait(30000); + test.TestHelper.test(_callback); } catch(InterruptedException ex) { diff --git a/java-compat/test/src/main/java/test/Ice/objects/AllTests.java b/java-compat/test/src/main/java/test/Ice/objects/AllTests.java index 7304a0ffb28..8602b6f0d08 100644 --- a/java-compat/test/src/main/java/test/Ice/objects/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/objects/AllTests.java @@ -37,6 +37,13 @@ import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrxHelper; import test.Ice.objects.Test.StructKey; import test.Ice.objects.Test.M; import test.Ice.objects.Test.MHolder; +import test.Ice.objects.Test.F1; +import test.Ice.objects.Test.F1Holder; +import test.Ice.objects.Test.F2Prx; +import test.Ice.objects.Test.F2PrxHolder; +import test.Ice.objects.Test.F2PrxHelper; +import test.Ice.objects.Test.F3; +import test.Ice.objects.Test.F3Holder; public class AllTests { @@ -406,6 +413,35 @@ public class AllTests } out.println("ok"); + out.print("testing forward declared types... "); + out.flush(); + { + F1Holder f12 = new F1Holder(); + F1 f11 = initial.opF1(new F1("F11"), f12); + test(f11.name.equals("F11")); + test(f12.value.name.equals("F12")); + + F2PrxHolder f22 = new F2PrxHolder(); + F2Prx f21 = initial.opF2(F2PrxHelper.uncheckedCast(communicator.stringToProxy("F21")), f22); + test(f21.ice_getIdentity().name.equals("F21")); + test(f22.value.ice_getIdentity().name.equals("F22")); + + if(initial.hasF3()) + { + F3Holder f32 = new F3Holder(); + F3 f31 = initial.opF3(new F3(new F1("F11"), + F2PrxHelper.uncheckedCast(communicator.stringToProxy("F21"))), + f32); + + test(f31.f1.name.equals("F11")); + test(f31.f2.ice_getIdentity().name.equals("F21")); + + test(f32.value.f1.name.equals("F12")); + test(f32.value.f2.ice_getIdentity().name.equals("F22")); + } + } + out.println("ok"); + return initial; } } diff --git a/java-compat/test/src/main/java/test/Ice/objects/Forward.ice b/java-compat/test/src/main/java/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..057b9424c6d --- /dev/null +++ b/java-compat/test/src/main/java/test/Ice/objects/Forward.ice @@ -0,0 +1,22 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +[["java:package:test.Ice.objects"]] + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/java-compat/test/src/main/java/test/Ice/objects/InitialI.java b/java-compat/test/src/main/java/test/Ice/objects/InitialI.java index 5b1bc633643..1a48cf0f7bf 100644 --- a/java-compat/test/src/main/java/test/Ice/objects/InitialI.java +++ b/java-compat/test/src/main/java/test/Ice/objects/InitialI.java @@ -30,6 +30,13 @@ import test.Ice.objects.Test.Compact; import test.Ice.objects.Test.CompactExt; import test.Ice.objects.Test.M; import test.Ice.objects.Test.MHolder; +import test.Ice.objects.Test.F1; +import test.Ice.objects.Test.F1Holder; +import test.Ice.objects.Test.F2Prx; +import test.Ice.objects.Test.F2PrxHolder; +import test.Ice.objects.Test.F2PrxHelper; +import test.Ice.objects.Test.F3; +import test.Ice.objects.Test.F3Holder; public final class InitialI extends Initial { @@ -290,6 +297,38 @@ public final class InitialI extends Initial return v1; } + @Override + public F1 + opF1(F1 f11, F1Holder f12, Ice.Current current) + { + f12.value = new F1("F12"); + return f11; + } + + @Override + public F2Prx + opF2(F2Prx f21, F2PrxHolder f22, Ice.Current current) + { + f22.value = F2PrxHelper.uncheckedCast(current.adapter.getCommunicator().stringToProxy("F22")); + return f21; + } + + @Override + public F3 + opF3(F3 f31, F3Holder f32, Ice.Current current) + { + f32.value = new F3(new F1("F12"), + F2PrxHelper.uncheckedCast(current.adapter.getCommunicator().stringToProxy("F22"))); + return f31; + } + + @Override + public boolean + hasF3(Ice.Current current) + { + return true; + } + private Ice.ObjectAdapter _adapter; private B _b1; private B _b2; diff --git a/java-compat/test/src/main/java/test/Ice/objects/Test.ice b/java-compat/test/src/main/java/test/Ice/objects/Test.ice index 28f1065a9ec..9af55ef027c 100644 --- a/java-compat/test/src/main/java/test/Ice/objects/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/objects/Test.ice @@ -194,6 +194,18 @@ class M LMap v; } +// +// Forward delcarations +// +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + class Initial { void shutdown(); @@ -239,6 +251,11 @@ class Initial void throwInnerSubEx() throws Inner::Sub::Ex; M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } class Empty diff --git a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java index 1538ab3d901..e4a57497ee6 100644 --- a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java +++ b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java @@ -1509,6 +1509,10 @@ public class AllTests IceSSL.ConnectionInfo info = (IceSSL.ConnectionInfo)server.ice_getConnection().getInfo(); test(info.cipher.toLowerCase().contains("dss")); } + catch(Ice.ConnectionLostException ex) + { + // Expected on systems that disable DSA + } catch(Ice.LocalException ex) { ex.printStackTrace(); @@ -2250,7 +2254,7 @@ public class AllTests initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout Ice.Communicator comm = Ice.Util.initialize(initData); - Ice.ObjectPrx p = comm.stringToProxy("dummy:wss -h demo.zeroc.com -p 5064"); + Ice.ObjectPrx p = comm.stringToProxy("dummy:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try @@ -2297,7 +2301,7 @@ public class AllTests initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); comm = Ice.Util.initialize(initData); - p = comm.stringToProxy("dummy:wss -h demo.zeroc.com -p 5064"); + p = comm.stringToProxy("dummy:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try diff --git a/java/gradle.properties b/java/gradle.properties index ea1ca4786c8..cfa5a5c4bc7 100644 --- a/java/gradle.properties +++ b/java/gradle.properties @@ -34,6 +34,11 @@ jgoodiesLooksVersion = 2.7.0 jgoodiesFormsVersion = 1.9.0 // +// The OpenJFX version to use with IceGridGUI builds +// +openjfxVersion = 11.0.2 + +// // Set to true if you want IceGridGUI build to create a standalone JAR // using proguard. // diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle index 3372d92b2d2..9b5c5dd5003 100644 --- a/java/src/IceGridGUI/build.gradle +++ b/java/src/IceGridGUI/build.gradle @@ -60,10 +60,10 @@ dependencies { implementation "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}" if(hasJavaFx && GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) { - implementation "org.openjfx:javafx-base:11.0.2:$platform" - implementation "org.openjfx:javafx-swing:11.0.2:$platform" - implementation "org.openjfx:javafx-controls:11.0.2:$platform" - implementation "org.openjfx:javafx-graphics:11.0.2:$platform" + implementation "org.openjfx:javafx-base:${openjfxVersion}:${platform}" + implementation "org.openjfx:javafx-swing:${openjfxVersion}:${platform}" + implementation "org.openjfx:javafx-controls:${openjfxVersion}:${platform}" + implementation "org.openjfx:javafx-graphics:${openjfxVersion}:${platform}" } } diff --git a/java/test/android/controller/build.gradle b/java/test/android/controller/build.gradle index a8141bfa935..2e5f8ca9e75 100644 --- a/java/test/android/controller/build.gradle +++ b/java/test/android/controller/build.gradle @@ -95,9 +95,9 @@ clean { ext.localDependency = { artifactId -> if(project.slice.srcDist || System.env.ICE_BIN_DIST == "cpp") { - return ":${artifactId}-${project.slice.iceArtifactVersion}" + return ":${artifactId}-${project.iceVersion}" } else { - return "com.zeroc:${artifactId}:${project.version}" + return "com.zeroc:${artifactId}:${project.iceVersion}" } } diff --git a/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java index d10059a22af..ef1d9468420 100644 --- a/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java +++ b/java/test/src/main/java/test/Glacier2/router/CallbackReceiverI.java @@ -37,7 +37,8 @@ final class CallbackReceiverI implements CallbackReceiver { try { - wait(); + wait(30000); + test.TestHelper.test(_callback); } catch(InterruptedException ex) { diff --git a/java/test/src/main/java/test/Ice/objects/AllTests.java b/java/test/src/main/java/test/Ice/objects/AllTests.java index 77129e806c2..f15b0cf83c9 100644 --- a/java/test/src/main/java/test/Ice/objects/AllTests.java +++ b/java/test/src/main/java/test/Ice/objects/AllTests.java @@ -35,6 +35,11 @@ import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrx; import test.Ice.objects.Test.M; import test.Ice.objects.Test.StructKey; import test.Ice.objects.Test.Initial.OpMResult; + +import test.Ice.objects.Test.F1; +import test.Ice.objects.Test.F2Prx; +import test.Ice.objects.Test.F3; + public class AllTests { private static void test(boolean b) @@ -404,6 +409,30 @@ public class AllTests } out.println("ok"); + out.print("testing forward declared types... "); + out.flush(); + { + Initial.OpF1Result opF1Result = initial.opF1(new F1("F11")); + test(opF1Result.returnValue.name.equals("F11")); + test(opF1Result.f12.name.equals("F12")); + + Initial.OpF2Result opF2Result = initial.opF2(F2Prx.uncheckedCast(communicator.stringToProxy("F21"))); + test(opF2Result.returnValue.ice_getIdentity().name.equals("F21")); + test(opF2Result.f22.ice_getIdentity().name.equals("F22")); + + if(initial.hasF3()) + { + Initial.OpF3Result opF3Result = initial.opF3(new F3(new F1("F11"), + F2Prx.uncheckedCast(communicator.stringToProxy("F21")))); + test(opF3Result.returnValue.f1.name.equals("F11")); + test(opF3Result.returnValue.f2.ice_getIdentity().name.equals("F21")); + + test(opF3Result.f32.f1.name.equals("F12")); + test(opF3Result.f32.f2.ice_getIdentity().name.equals("F22")); + } + } + out.println("ok"); + return initial; } } diff --git a/java/test/src/main/java/test/Ice/objects/Forward.ice b/java/test/src/main/java/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..057b9424c6d --- /dev/null +++ b/java/test/src/main/java/test/Ice/objects/Forward.ice @@ -0,0 +1,22 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +[["java:package:test.Ice.objects"]] + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/java/test/src/main/java/test/Ice/objects/InitialI.java b/java/test/src/main/java/test/Ice/objects/InitialI.java index c886195551a..7760480f1e9 100644 --- a/java/test/src/main/java/test/Ice/objects/InitialI.java +++ b/java/test/src/main/java/test/Ice/objects/InitialI.java @@ -243,6 +243,40 @@ public final class InitialI implements Initial return r; } + @Override + public Initial.OpF1Result opF1(F1 f11, com.zeroc.Ice.Current current) + { + Initial.OpF1Result r = new Initial.OpF1Result(); + r.returnValue = f11; + r.f12 = new F1("F12"); + return r; + } + + @Override + public Initial.OpF2Result opF2(F2Prx f21, com.zeroc.Ice.Current current) + { + Initial.OpF2Result r = new Initial.OpF2Result(); + r.returnValue = f21; + r.f22 = F2Prx.uncheckedCast(current.adapter.getCommunicator().stringToProxy("F22")); + return r; + } + + @Override + public Initial.OpF3Result opF3(F3 f31, com.zeroc.Ice.Current current) + { + Initial.OpF3Result r = new Initial.OpF3Result(); + r.returnValue = f31; + r.f32 = new F3(new F1("F12"), + F2Prx.uncheckedCast(current.adapter.getCommunicator().stringToProxy("F22"))); + return r; + } + + @Override + public boolean hasF3(com.zeroc.Ice.Current current) + { + return true; + } + private com.zeroc.Ice.ObjectAdapter _adapter; private B _b1; private B _b2; diff --git a/java/test/src/main/java/test/Ice/objects/Test.ice b/java/test/src/main/java/test/Ice/objects/Test.ice index cc72f1323c9..50e6248fd4a 100644 --- a/java/test/src/main/java/test/Ice/objects/Test.ice +++ b/java/test/src/main/java/test/Ice/objects/Test.ice @@ -194,6 +194,15 @@ class M LMap v; } +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + interface Initial { void shutdown(); @@ -239,6 +248,11 @@ interface Initial void throwInnerSubEx() throws Inner::Sub::Ex; M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } class Empty diff --git a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java index 95cb082b04c..1f978a03e7d 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java @@ -1509,6 +1509,10 @@ public class AllTests (com.zeroc.IceSSL.ConnectionInfo)server.ice_getConnection().getInfo(); test(info.cipher.toLowerCase().contains("dss")); } + catch(com.zeroc.Ice.ConnectionLostException ex) + { + // Expected on systems that disable DSA + } catch(com.zeroc.Ice.LocalException ex) { ex.printStackTrace(); @@ -2250,7 +2254,7 @@ public class AllTests initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout com.zeroc.Ice.Communicator comm = Util.initialize(initData); - com.zeroc.Ice.ObjectPrx p = comm.stringToProxy("dummy:wss -h demo.zeroc.com -p 5064"); + com.zeroc.Ice.ObjectPrx p = comm.stringToProxy("dummy:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try @@ -2298,7 +2302,7 @@ public class AllTests initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); comm = Util.initialize(initData); - p = comm.stringToProxy("dummy:wss -h demo.zeroc.com -p 5064"); + p = comm.stringToProxy("dummy:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while(true) { try diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js index 01ec47a6cca..26466bef266 100644 --- a/js/bin/HttpServer.js +++ b/js/bin/HttpServer.js @@ -70,7 +70,8 @@ function Init() var testpath = path.resolve(path.join(this._basePath, "test", matchController[1])) var worker = req.url.query.worker == "True"; var scripts = es5 ? [ - "/node_modules/@babel/polyfill/dist/polyfill.js", + "/node_modules/core-js-bundle/minified.js", + "/node_modules/regenerator-runtime/runtime.js", "/lib/es5/Ice.js", "/test/es5/Common/TestHelper.js", "/test/es5/Common/Controller.js", diff --git a/js/gulpfile.js b/js/gulpfile.js index db89de90085..2726f074c90 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -370,7 +370,8 @@ gulp.task("test:common:babel", gulp.task("test:common:controllerworker", cb => { - pump([gulp.src(["node_modules/@babel/polyfill/dist/polyfill.js", + pump([gulp.src(["node_modules/core-js-bundle/minified.js", + "node_modules/regenerator-runtime/runtime.js", "test/es5/Common/ControllerWorker.js"]), concat("ControllerWorker.js"), gulp.dest("test/es5/Common/")], cb); diff --git a/js/package-lock.json b/js/package-lock.json index a2721a185b6..e0b017e6a6f 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -5,17 +5,17 @@ "requires": true, "dependencies": { "@babel/cli": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.2.3.tgz", - "integrity": "sha512-bfna97nmJV6nDJhXNPeEfxyMjWnt6+IjUAaDPiYRTBlm8L41n8nvw6UAqUCbvpFfU246gHPxW7sfWwqtF4FcYA==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.5.0.tgz", + "integrity": "sha512-qNH55fWbKrEsCwID+Qc/3JDPnsSGpIIiMDbppnR8Z6PxLAqMQCFNqBctkIkBrMH49Nx+qqVTrHRWUR+ho2k+qQ==", "dev": true, "requires": { - "chokidar": "^2.0.3", + "chokidar": "^2.0.4", "commander": "^2.8.1", "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", "glob": "^7.0.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "mkdirp": "^0.5.1", "output-file-sync": "^2.0.0", "slash": "^2.0.0", @@ -40,85 +40,27 @@ } }, "@babel/core": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz", - "integrity": "sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.0.tgz", + "integrity": "sha512-6Isr4X98pwXqHvtigw71CKgmhL1etZjPs5A67jL/w0TkLM9eqmFR40YrnJvEc1WnMZFsskjsmid8bHZyxKEAnw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.2.2", - "@babel/helpers": "^7.2.0", - "@babel/parser": "^7.2.2", - "@babel/template": "^7.2.2", - "@babel/traverse": "^7.2.2", - "@babel/types": "^7.2.2", + "@babel/generator": "^7.5.0", + "@babel/helpers": "^7.5.0", + "@babel/parser": "^7.5.0", + "@babel/template": "^7.4.4", + "@babel/traverse": "^7.5.0", + "@babel/types": "^7.5.0", "convert-source-map": "^1.1.0", "debug": "^4.1.0", "json5": "^2.1.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" }, "dependencies": { - "@babel/generator": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.2.tgz", - "integrity": "sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==", - "dev": true, - "requires": { - "@babel/types": "^7.2.2", - "jsesc": "^2.5.1", - "lodash": "^4.17.10", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "@babel/parser": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz", - "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==", - "dev": true - }, - "@babel/template": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz", - "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.2.2", - "@babel/types": "^7.2.2" - } - }, - "@babel/traverse": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz", - "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.2.2", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/parser": "^7.2.3", - "@babel/types": "^7.2.2", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.10" - } - }, - "@babel/types": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz", - "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.10", - "to-fast-properties": "^2.0.0" - } - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -129,9 +71,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "source-map": { @@ -143,14 +85,14 @@ } }, "@babel/generator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.0.tgz", - "integrity": "sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz", + "integrity": "sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==", "dev": true, "requires": { - "@babel/types": "^7.2.0", + "@babel/types": "^7.5.0", "jsesc": "^2.5.1", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "source-map": "^0.5.0", "trim-right": "^1.0.1" }, @@ -183,25 +125,25 @@ } }, "@babel/helper-call-delegate": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz", - "integrity": "sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz", + "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.0.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-hoist-variables": "^7.4.4", + "@babel/traverse": "^7.4.4", + "@babel/types": "^7.4.4" } }, "@babel/helper-define-map": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz", - "integrity": "sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz", + "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==", "dev": true, "requires": { "@babel/helper-function-name": "^7.1.0", - "@babel/types": "^7.0.0", - "lodash": "^4.17.10" + "@babel/types": "^7.4.4", + "lodash": "^4.17.11" } }, "@babel/helper-explode-assignable-expression": { @@ -235,12 +177,12 @@ } }, "@babel/helper-hoist-variables": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz", - "integrity": "sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz", + "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.4.4" } }, "@babel/helper-member-expression-to-functions": { @@ -262,47 +204,17 @@ } }, "@babel/helper-module-transforms": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz", - "integrity": "sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz", + "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-simple-access": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/template": "^7.2.2", - "@babel/types": "^7.2.2", - "lodash": "^4.17.10" - }, - "dependencies": { - "@babel/parser": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz", - "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==", - "dev": true - }, - "@babel/template": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz", - "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.2.2", - "@babel/types": "^7.2.2" - } - }, - "@babel/types": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz", - "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.10", - "to-fast-properties": "^2.0.0" - } - } + "@babel/helper-split-export-declaration": "^7.4.4", + "@babel/template": "^7.4.4", + "@babel/types": "^7.4.4", + "lodash": "^4.17.11" } }, "@babel/helper-optimise-call-expression": { @@ -321,12 +233,12 @@ "dev": true }, "@babel/helper-regex": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz", - "integrity": "sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz", + "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==", "dev": true, "requires": { - "lodash": "^4.17.10" + "lodash": "^4.17.11" } }, "@babel/helper-remap-async-to-generator": { @@ -343,100 +255,15 @@ } }, "@babel/helper-replace-supers": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz", - "integrity": "sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz", + "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.0.0", "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/traverse": "^7.2.3", - "@babel/types": "^7.0.0" - }, - "dependencies": { - "@babel/generator": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.2.tgz", - "integrity": "sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==", - "dev": true, - "requires": { - "@babel/types": "^7.2.2", - "jsesc": "^2.5.1", - "lodash": "^4.17.10", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - }, - "dependencies": { - "@babel/types": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz", - "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.10", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz", - "integrity": "sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==", - "dev": true - }, - "@babel/traverse": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz", - "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.2.2", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/parser": "^7.2.3", - "@babel/types": "^7.2.2", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.10" - }, - "dependencies": { - "@babel/types": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz", - "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.10", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } + "@babel/traverse": "^7.4.4", + "@babel/types": "^7.4.4" } }, "@babel/helper-simple-access": { @@ -450,12 +277,12 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz", - "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", + "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.4.4" } }, "@babel/helper-wrap-function": { @@ -471,20 +298,20 @@ } }, "@babel/helpers": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.2.0.tgz", - "integrity": "sha512-Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.0.tgz", + "integrity": "sha512-EgCUEa8cNwuMrwo87l2d7i2oShi8m2Q58H7h3t4TWtqATZalJYFwfL9DulRe02f3KdqM9xmMCw3v/7Ll+EiaWg==", "dev": true, "requires": { - "@babel/template": "^7.1.2", - "@babel/traverse": "^7.1.5", - "@babel/types": "^7.2.0" + "@babel/template": "^7.4.4", + "@babel/traverse": "^7.5.0", + "@babel/types": "^7.5.0" } }, "@babel/highlight": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz", - "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", + "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", "dev": true, "requires": { "chalk": "^2.0.0", @@ -493,9 +320,9 @@ } }, "@babel/parser": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz", - "integrity": "sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz", + "integrity": "sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { @@ -509,6 +336,16 @@ "@babel/plugin-syntax-async-generators": "^7.2.0" } }, + "@babel/plugin-proposal-dynamic-import": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz", + "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-syntax-dynamic-import": "^7.2.0" + } + }, "@babel/plugin-proposal-json-strings": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", @@ -520,9 +357,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.2.0.tgz", - "integrity": "sha512-1L5mWLSvR76XYUQJXkd/EEQgjq8HHRP6lQuZTTg0VA4tTGPpGemmCdAfQIz1rzEuWAm+ecP8PyyEm30jC1eQCg==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.0.tgz", + "integrity": "sha512-G1qy5EdcO3vYhbxlXjRSR2SXB8GsxYv9hoRKT1Jdn3qy/NUnFqUUnqymKZ00Pbj+3FXNh06B+BUZzecrp3sxNw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -540,14 +377,14 @@ } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz", - "integrity": "sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz", + "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0", - "regexpu-core": "^4.2.0" + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.5.4" } }, "@babel/plugin-syntax-async-generators": { @@ -559,6 +396,15 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz", + "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, "@babel/plugin-syntax-json-strings": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", @@ -596,9 +442,9 @@ } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz", - "integrity": "sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz", + "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", @@ -616,28 +462,28 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz", - "integrity": "sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz", + "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "lodash": "^4.17.10" + "lodash": "^4.17.11" } }, "@babel/plugin-transform-classes": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz", - "integrity": "sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz", + "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-define-map": "^7.1.0", + "@babel/helper-define-map": "^7.4.4", "@babel/helper-function-name": "^7.1.0", "@babel/helper-optimise-call-expression": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", + "@babel/helper-replace-supers": "^7.4.4", + "@babel/helper-split-export-declaration": "^7.4.4", "globals": "^11.1.0" } }, @@ -651,29 +497,29 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz", - "integrity": "sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz", + "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz", - "integrity": "sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz", + "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0", - "regexpu-core": "^4.1.3" + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.5.4" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz", - "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz", + "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -690,18 +536,18 @@ } }, "@babel/plugin-transform-for-of": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz", - "integrity": "sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz", + "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-function-name": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz", - "integrity": "sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz", + "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==", "dev": true, "requires": { "@babel/helper-function-name": "^7.1.0", @@ -717,35 +563,47 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-transform-modules-amd": { + "@babel/plugin-transform-member-expression-literals": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz", - "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", + "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz", - "integrity": "sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==", + "@babel/plugin-transform-modules-amd": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz", + "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0" + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz", + "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.4.4", + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-simple-access": "^7.1.0", + "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz", - "integrity": "sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz", + "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-hoist-variables": "^7.4.4", + "@babel/helper-plugin-utils": "^7.0.0", + "babel-plugin-dynamic-import-node": "^2.3.0" } }, "@babel/plugin-transform-modules-umd": { @@ -758,10 +616,19 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz", + "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==", + "dev": true, + "requires": { + "regexp-tree": "^0.1.6" + } + }, "@babel/plugin-transform-new-target": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz", - "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz", + "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -778,23 +645,41 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz", - "integrity": "sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz", + "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==", "dev": true, "requires": { - "@babel/helper-call-delegate": "^7.1.0", + "@babel/helper-call-delegate": "^7.4.4", "@babel/helper-get-function-arity": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-transform-property-literals": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz", + "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, "@babel/plugin-transform-regenerator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz", - "integrity": "sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz", + "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==", "dev": true, "requires": { - "regenerator-transform": "^0.13.3" + "regenerator-transform": "^0.14.0" + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz", + "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-shorthand-properties": { @@ -826,9 +711,9 @@ } }, "@babel/plugin-transform-template-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz", - "integrity": "sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz", + "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", @@ -845,128 +730,127 @@ } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz", - "integrity": "sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz", + "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0", - "regexpu-core": "^4.1.3" - } - }, - "@babel/polyfill": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz", - "integrity": "sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==", - "dev": true, - "requires": { - "core-js": "^2.5.7", - "regenerator-runtime": "^0.12.0" + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.5.4" } }, "@babel/preset-env": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.3.tgz", - "integrity": "sha512-AuHzW7a9rbv5WXmvGaPX7wADxFkZIqKlbBh1dmZUQp4iwiPpkE/Qnrji6SC4UQCQzvWY/cpHET29eUhXS9cLPw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.0.tgz", + "integrity": "sha512-/5oQ7cYg+6sH9Dt9yx5IiylnLPiUdyMHl5y+K0mKVNiW2wJ7FpU5bg8jKcT8PcCbxdYzfv6OuC63jLEtMuRSmQ==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-proposal-async-generator-functions": "^7.2.0", + "@babel/plugin-proposal-dynamic-import": "^7.5.0", "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.2.0", + "@babel/plugin-proposal-object-rest-spread": "^7.5.0", "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.2.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", "@babel/plugin-syntax-async-generators": "^7.2.0", + "@babel/plugin-syntax-dynamic-import": "^7.2.0", + "@babel/plugin-syntax-json-strings": "^7.2.0", "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", "@babel/plugin-transform-arrow-functions": "^7.2.0", - "@babel/plugin-transform-async-to-generator": "^7.2.0", + "@babel/plugin-transform-async-to-generator": "^7.5.0", "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.2.0", - "@babel/plugin-transform-classes": "^7.2.0", + "@babel/plugin-transform-block-scoping": "^7.4.4", + "@babel/plugin-transform-classes": "^7.4.4", "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.2.0", - "@babel/plugin-transform-dotall-regex": "^7.2.0", - "@babel/plugin-transform-duplicate-keys": "^7.2.0", + "@babel/plugin-transform-destructuring": "^7.5.0", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/plugin-transform-duplicate-keys": "^7.5.0", "@babel/plugin-transform-exponentiation-operator": "^7.2.0", - "@babel/plugin-transform-for-of": "^7.2.0", - "@babel/plugin-transform-function-name": "^7.2.0", + "@babel/plugin-transform-for-of": "^7.4.4", + "@babel/plugin-transform-function-name": "^7.4.4", "@babel/plugin-transform-literals": "^7.2.0", - "@babel/plugin-transform-modules-amd": "^7.2.0", - "@babel/plugin-transform-modules-commonjs": "^7.2.0", - "@babel/plugin-transform-modules-systemjs": "^7.2.0", + "@babel/plugin-transform-member-expression-literals": "^7.2.0", + "@babel/plugin-transform-modules-amd": "^7.5.0", + "@babel/plugin-transform-modules-commonjs": "^7.5.0", + "@babel/plugin-transform-modules-systemjs": "^7.5.0", "@babel/plugin-transform-modules-umd": "^7.2.0", - "@babel/plugin-transform-new-target": "^7.0.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5", + "@babel/plugin-transform-new-target": "^7.4.4", "@babel/plugin-transform-object-super": "^7.2.0", - "@babel/plugin-transform-parameters": "^7.2.0", - "@babel/plugin-transform-regenerator": "^7.0.0", + "@babel/plugin-transform-parameters": "^7.4.4", + "@babel/plugin-transform-property-literals": "^7.2.0", + "@babel/plugin-transform-regenerator": "^7.4.5", + "@babel/plugin-transform-reserved-words": "^7.2.0", "@babel/plugin-transform-shorthand-properties": "^7.2.0", "@babel/plugin-transform-spread": "^7.2.0", "@babel/plugin-transform-sticky-regex": "^7.2.0", - "@babel/plugin-transform-template-literals": "^7.2.0", + "@babel/plugin-transform-template-literals": "^7.4.4", "@babel/plugin-transform-typeof-symbol": "^7.2.0", - "@babel/plugin-transform-unicode-regex": "^7.2.0", - "browserslist": "^4.3.4", + "@babel/plugin-transform-unicode-regex": "^7.4.4", + "@babel/types": "^7.5.0", + "browserslist": "^4.6.0", + "core-js-compat": "^3.1.1", "invariant": "^2.2.2", "js-levenshtein": "^1.1.3", - "semver": "^5.3.0" + "semver": "^5.5.0" } }, "@babel/template": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz", - "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", + "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.1.2", - "@babel/types": "^7.1.2" + "@babel/parser": "^7.4.4", + "@babel/types": "^7.4.4" } }, "@babel/traverse": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz", - "integrity": "sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz", + "integrity": "sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.1.6", + "@babel/generator": "^7.5.0", "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/parser": "^7.1.6", - "@babel/types": "^7.1.6", + "@babel/helper-split-export-declaration": "^7.4.4", + "@babel/parser": "^7.5.0", + "@babel/types": "^7.5.0", "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.10" + "lodash": "^4.17.11" }, "dependencies": { "debug": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, "@babel/types": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.0.tgz", - "integrity": "sha512-b4v7dyfApuKDvmPb+O488UlGuR1WbwMXFsO/cyqMrnfvRAChZKJAYeeglWTjUO1b9UghKKgepAQM5tsvBJca6A==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz", + "integrity": "sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "to-fast-properties": "^2.0.0" } }, @@ -983,6 +867,15 @@ "through2": "^2.0.3" }, "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -1011,6 +904,15 @@ "through2": "^2.0.3" }, "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, "through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -1124,6 +1026,17 @@ "requires": { "micromatch": "^3.1.4", "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } } }, "append-buffer": { @@ -1271,29 +1184,21 @@ "dev": true }, "async-done": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.1.tgz", - "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz", + "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.2", - "process-nextick-args": "^1.0.7", + "process-nextick-args": "^2.0.0", "stream-exhaust": "^1.0.1" - }, - "dependencies": { - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - } } }, "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", "dev": true }, "async-settle": { @@ -1311,6 +1216,15 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", + "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", + "dev": true, + "requires": { + "object.assign": "^4.1.0" + } + }, "babel-plugin-rewrite-require": { "version": "1.14.5", "resolved": "https://registry.npmjs.org/babel-plugin-rewrite-require/-/babel-plugin-rewrite-require-1.14.5.tgz", @@ -1396,9 +1310,9 @@ } }, "binary-extensions": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz", - "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, "brace-expansion": { @@ -1441,14 +1355,14 @@ } }, "browserslist": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.7.tgz", - "integrity": "sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.3.tgz", + "integrity": "sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000925", - "electron-to-chromium": "^1.3.96", - "node-releases": "^1.1.3" + "caniuse-lite": "^1.0.30000975", + "electron-to-chromium": "^1.3.164", + "node-releases": "^1.1.23" } }, "buffer-equal": { @@ -1463,12 +1377,6 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -1499,15 +1407,15 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30000926", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz", - "integrity": "sha512-diMkEvxfFw09SkbErCLmw/1Fx1ZZe9xfWm4aeA2PUffB48x1tfZeMsK5j4BW7zN7Y4PdqmPVVdG2eYjE5IRTag==", + "version": "1.0.30000979", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000979.tgz", + "integrity": "sha512-gcu45yfq3B7Y+WB05fOMfr0EiSlq+1u+m6rPHyJli/Wy3PVQNGaU7VA4bZE5qw+AU2UVOBR/N5g1bzADUqdvFw==", "dev": true }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -1516,24 +1424,23 @@ } }, "chokidar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", - "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", + "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", "dev": true, "requires": { "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", - "inherits": "^2.0.1", + "inherits": "^2.0.3", "is-binary-path": "^1.0.0", "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", + "normalize-path": "^3.0.0", "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "class-utils": { @@ -1670,9 +1577,9 @@ "dev": true }, "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, "concat-map": { @@ -1745,9 +1652,40 @@ } }, "core-js": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz", - "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz", + "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==", + "dev": true + }, + "core-js-bundle": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/core-js-bundle/-/core-js-bundle-3.1.4.tgz", + "integrity": "sha512-z6XvMCy2LH2LI31KttZd23n4UYoDx+P205iRamWsAZ2qRgr8stWmM7n5kMno/d+PucvPKpZZPb17caOSGjScVQ==", + "dev": true + }, + "core-js-compat": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz", + "integrity": "sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==", + "dev": true, + "requires": { + "browserslist": "^4.6.2", + "core-js-pure": "3.1.4", + "semver": "^6.1.1" + }, + "dependencies": { + "semver": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", + "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", + "dev": true + } + } + }, + "core-js-pure": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz", + "integrity": "sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==", "dev": true }, "core-util-is": { @@ -1777,12 +1715,13 @@ } }, "d": { - "version": "1.0.0", - "resolved": "http://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", "dev": true, "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "^0.10.50", + "type": "^1.0.1" } }, "date-now": { @@ -1821,9 +1760,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } @@ -1940,21 +1879,15 @@ "dev": true }, "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", "dev": true, "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" + "domelementtype": "^1.3.0", + "entities": "^1.1.1" }, "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - }, "entities": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", @@ -1995,9 +1928,9 @@ "dev": true }, "duplexify": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz", - "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, "requires": { "end-of-stream": "^1.0.0", @@ -2031,9 +1964,9 @@ } }, "electron-to-chromium": { - "version": "1.3.96", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz", - "integrity": "sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==", + "version": "1.3.187", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.187.tgz", + "integrity": "sha512-XCEygaK7Fs35/RwS+67YbBWs/ydG+oUFPuy1wv558jC3Opd2DHwRyRqrCmhxpmPmCSVlZujYX4TOmOXuMz2GZA==", "dev": true }, "end-of-stream": { @@ -2061,14 +1994,14 @@ } }, "es5-ext": { - "version": "0.10.46", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz", - "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==", + "version": "0.10.50", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz", + "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==", "dev": true, "requires": { "es6-iterator": "~2.0.3", "es6-symbol": "~3.1.1", - "next-tick": "1" + "next-tick": "^1.0.0" } }, "es6-iterator": { @@ -2093,14 +2026,14 @@ } }, "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", "dev": true, "requires": { "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.1" } }, @@ -2326,32 +2259,21 @@ } }, "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", + "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", "dev": true, "requires": { "detect-file": "^1.0.0", - "is-glob": "^3.1.0", + "is-glob": "^4.0.0", "micromatch": "^3.0.4", "resolve-dir": "^1.0.1" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } } }, "fined": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", - "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", + "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", "dev": true, "requires": { "expand-tilde": "^2.0.2", @@ -2362,19 +2284,19 @@ } }, "flagged-respawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz", - "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", + "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", "dev": true }, "flush-write-stream": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", - "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" } }, "follow-redirects": { @@ -2456,14 +2378,14 @@ "dev": true }, "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", + "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", "dev": true, "optional": true, "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" + "nan": "^2.12.1", + "node-pre-gyp": "^0.12.0" }, "dependencies": { "abbrev": { @@ -2475,7 +2397,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2484,7 +2407,7 @@ "optional": true }, "are-we-there-yet": { - "version": "1.1.4", + "version": "1.1.5", "bundled": true, "dev": true, "optional": true, @@ -2510,7 +2433,7 @@ } }, "chownr": { - "version": "1.0.1", + "version": "1.1.1", "bundled": true, "dev": true, "optional": true @@ -2540,16 +2463,16 @@ "optional": true }, "debug": { - "version": "2.6.9", + "version": "4.1.1", "bundled": true, "dev": true, "optional": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "deep-extend": { - "version": "0.5.1", + "version": "0.6.0", "bundled": true, "dev": true, "optional": true @@ -2598,7 +2521,7 @@ } }, "glob": { - "version": "7.1.2", + "version": "7.1.3", "bundled": true, "dev": true, "optional": true, @@ -2618,12 +2541,12 @@ "optional": true }, "iconv-lite": { - "version": "0.4.21", + "version": "0.4.24", "bundled": true, "dev": true, "optional": true, "requires": { - "safer-buffer": "^2.1.0" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { @@ -2688,17 +2611,17 @@ "optional": true }, "minipass": { - "version": "2.2.4", + "version": "2.3.5", "bundled": true, "dev": true, "optional": true, "requires": { - "safe-buffer": "^5.1.1", + "safe-buffer": "^5.1.2", "yallist": "^3.0.0" } }, "minizlib": { - "version": "1.1.0", + "version": "1.2.1", "bundled": true, "dev": true, "optional": true, @@ -2716,35 +2639,35 @@ } }, "ms": { - "version": "2.0.0", + "version": "2.1.1", "bundled": true, "dev": true, "optional": true }, "needle": { - "version": "2.2.0", + "version": "2.3.0", "bundled": true, "dev": true, "optional": true, "requires": { - "debug": "^2.1.2", + "debug": "^4.1.0", "iconv-lite": "^0.4.4", "sax": "^1.2.4" } }, "node-pre-gyp": { - "version": "0.10.0", + "version": "0.12.0", "bundled": true, "dev": true, "optional": true, "requires": { "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", - "needle": "^2.2.0", + "needle": "^2.2.1", "nopt": "^4.0.1", "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", - "rc": "^1.1.7", + "rc": "^1.2.7", "rimraf": "^2.6.1", "semver": "^5.3.0", "tar": "^4" @@ -2761,13 +2684,13 @@ } }, "npm-bundled": { - "version": "1.0.3", + "version": "1.0.6", "bundled": true, "dev": true, "optional": true }, "npm-packlist": { - "version": "1.1.10", + "version": "1.4.1", "bundled": true, "dev": true, "optional": true, @@ -2844,12 +2767,12 @@ "optional": true }, "rc": { - "version": "1.2.7", + "version": "1.2.8", "bundled": true, "dev": true, "optional": true, "requires": { - "deep-extend": "^0.5.1", + "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" @@ -2879,18 +2802,19 @@ } }, "rimraf": { - "version": "2.6.2", + "version": "2.6.3", "bundled": true, "dev": true, "optional": true, "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" } }, "safe-buffer": { - "version": "5.1.1", + "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2905,7 +2829,7 @@ "optional": true }, "semver": { - "version": "5.5.0", + "version": "5.7.0", "bundled": true, "dev": true, "optional": true @@ -2946,6 +2870,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2957,17 +2882,17 @@ "optional": true }, "tar": { - "version": "4.4.1", + "version": "4.4.8", "bundled": true, "dev": true, "optional": true, "requires": { - "chownr": "^1.0.1", + "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", + "safe-buffer": "^5.1.2", "yallist": "^3.0.2" } }, @@ -2978,23 +2903,25 @@ "optional": true }, "wide-align": { - "version": "1.1.2", + "version": "1.1.3", "bundled": true, "dev": true, "optional": true, "requires": { - "string-width": "^1.0.2" + "string-width": "^1.0.2 || 2" } }, "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { - "version": "3.0.2", + "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -3108,9 +3035,9 @@ } }, "globals": { - "version": "11.9.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz", - "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==", + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, "globby": { @@ -3135,36 +3062,36 @@ } }, "glogg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", - "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", + "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", "dev": true, "requires": { "sparkles": "^1.0.0" } }, "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==", "dev": true }, "gulp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz", - "integrity": "sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", + "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==", "dev": true, "requires": { - "glob-watcher": "^5.0.0", - "gulp-cli": "^2.0.0", - "undertaker": "^1.0.0", + "glob-watcher": "^5.0.3", + "gulp-cli": "^2.2.0", + "undertaker": "^1.2.1", "vinyl-fs": "^3.0.0" }, "dependencies": { "gulp-cli": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz", - "integrity": "sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz", + "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==", "dev": true, "requires": { "ansi-colors": "^1.0.1", @@ -3177,7 +3104,7 @@ "gulplog": "^1.0.0", "interpret": "^1.1.0", "isobject": "^3.0.1", - "liftoff": "^2.5.0", + "liftoff": "^3.1.0", "matchdep": "^2.0.0", "mute-stdout": "^1.0.0", "pretty-hrtime": "^1.0.0", @@ -3371,9 +3298,9 @@ "dev": true }, "gulp-sourcemaps": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz", - "integrity": "sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=", + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz", + "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==", "dev": true, "requires": { "@gulp-sourcemaps/identity-map": "1.X", @@ -3408,33 +3335,21 @@ } }, "gulp-terser": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-1.1.6.tgz", - "integrity": "sha512-L+PgqJdj5fcn9BQIcpkHpz23lC/grr2JlOEj5Oegb/HasSASWrtDqML8yW6hwAr8DLv70u+HfeQe+vhVqCrOWw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-1.2.0.tgz", + "integrity": "sha512-lf+jE2DALg2w32p0HRiYMlFYRYelKZPNunHp2pZccCYrrdCLOs0ItbZcN63yr2pbz116IyhUG9mD/QbtRO1FKA==", "dev": true, "requires": { "plugin-error": "^1.0.1", - "terser": "^3.11.0", - "through2": "^3.0.0", + "terser": "^4.0.0", + "through2": "^3.0.1", "vinyl-sourcemaps-apply": "^0.2.1" - }, - "dependencies": { - "through2": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz", - "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==", - "dev": true, - "requires": { - "readable-stream": "2 || 3", - "xtend": "~4.0.1" - } - } } }, "gulp-typescript": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.0.tgz", - "integrity": "sha512-lMj2U+Ni6HyFaY2nr1sSQ6D014eHil5L1i52XWBaAQUR9UAUUp9btnm4yRBT2Jb8xhrwqmhMssZf/g2B7cinCA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.1.tgz", + "integrity": "sha512-YuMMlylyJtUSHG1/wuSVTrZp60k1dMEFKYOvDf7OvbAJWrDtxxD4oZon4ancdWwzjj30ztiidhe4VXJniF0pIQ==", "dev": true, "requires": { "ansi-colors": "^3.0.5", @@ -3446,20 +3361,10 @@ }, "dependencies": { "ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", "dev": true - }, - "through2": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz", - "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==", - "dev": true, - "requires": { - "readable-stream": "2 || 3", - "xtend": "~4.0.1" - } } } }, @@ -3558,9 +3463,9 @@ } }, "homedir-polyfill": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", - "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, "requires": { "parse-passwd": "^1.0.0" @@ -3645,9 +3550,9 @@ "dev": true }, "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "dev": true }, "invariant": { @@ -3716,15 +3621,6 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", @@ -3786,9 +3682,9 @@ } }, "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { "is-extglob": "^2.1.1" @@ -3920,9 +3816,9 @@ "dev": true }, "js-levenshtein": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz", - "integrity": "sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", + "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==", "dev": true }, "js-tokens": { @@ -3938,29 +3834,26 @@ "dev": true }, "jshint": { - "version": "2.9.7", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz", - "integrity": "sha512-Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==", + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz", + "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==", "dev": true, "requires": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", - "lodash": "~4.17.10", + "lodash": "~4.17.11", "minimatch": "~3.0.2", "shelljs": "0.3.x", "strip-json-comments": "1.0.x" } }, - "json-stable-stringify": { + "json-stable-stringify-without-jsonify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, - "requires": { - "jsonify": "~0.0.0" - } + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true }, "json5": { "version": "2.1.0", @@ -3979,12 +3872,6 @@ } } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, "just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -4041,13 +3928,13 @@ } }, "liftoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", - "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz", + "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==", "dev": true, "requires": { "extend": "^3.0.0", - "findup-sync": "^2.0.0", + "findup-sync": "^3.0.0", "fined": "^1.0.1", "flagged-respawn": "^1.0.0", "is-plain-object": "^2.0.4", @@ -4083,12 +3970,6 @@ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", "dev": true }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -4151,6 +4032,29 @@ "micromatch": "^3.0.4", "resolve": "^1.4.0", "stack-trace": "0.0.10" + }, + "dependencies": { + "findup-sync": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", + "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "dev": true, + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + } + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } } }, "memoizee": { @@ -4206,9 +4110,9 @@ "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -4248,9 +4152,9 @@ "dev": true }, "nan": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", - "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", "dev": true, "optional": true }, @@ -4280,9 +4184,9 @@ "dev": true }, "node-releases": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.3.tgz", - "integrity": "sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==", + "version": "1.1.25", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz", + "integrity": "sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==", "dev": true, "requires": { "semver": "^5.3.0" @@ -4298,30 +4202,27 @@ } }, "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", + "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true }, "now-and-later": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.0.tgz", - "integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", + "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", "dev": true, "requires": { "once": "^1.3.2" @@ -4371,9 +4272,9 @@ } }, "object-keys": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", - "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, "object-visit": { @@ -4746,24 +4647,24 @@ "dev": true }, "regenerate-unicode-properties": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz", - "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz", + "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==", "dev": true, "requires": { "regenerate": "^1.4.0" } }, "regenerator-runtime": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", - "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==", + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==", "dev": true }, "regenerator-transform": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz", - "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz", + "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==", "dev": true, "requires": { "private": "^0.1.6" @@ -4779,18 +4680,24 @@ "safe-regex": "^1.1.0" } }, + "regexp-tree": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz", + "integrity": "sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==", + "dev": true + }, "regexpu-core": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz", - "integrity": "sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", + "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", "dev": true, "requires": { "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^7.0.0", + "regenerate-unicode-properties": "^8.0.2", "regjsgen": "^0.5.0", "regjsparser": "^0.6.0", "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.0.2" + "unicode-match-property-value-ecmascript": "^1.1.0" } }, "regjsgen": { @@ -4903,12 +4810,12 @@ "dev": true }, "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", + "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "^1.0.6" } }, "resolve-dir": { @@ -4952,20 +4859,26 @@ } }, "rollup": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.0.1.tgz", - "integrity": "sha512-jf1EA9xJMx4hgEVdJQd8lVo2a0gbzY7fKM9kHZwQzcafYDapwLijd9G56Kxm2/RdEnQUEw9mSv8PyRWhsV0x2A==", + "version": "1.16.6", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.16.6.tgz", + "integrity": "sha512-oM3iKkzPCq9Da95wCnNfS8YlNZjgCD5c/TceKnJIthI9FOeJqnO3PUr/C5Suv9Kjzh0iphKL02PLeja3A5AMIA==", "dev": true, "requires": { "@types/estree": "0.0.39", - "@types/node": "*", - "acorn": "^6.0.4" + "@types/node": "^12.0.10", + "acorn": "^6.1.1" }, "dependencies": { + "@types/node": { + "version": "12.0.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.12.tgz", + "integrity": "sha512-Uy0PN4R5vgBUXFoJrKryf5aTk3kJ8Rv3PdlHjl6UaX+Cqp1QE0yPQ68MPXGrZOfG7gZVNDIJZYyot0B9ubXUrQ==", + "dev": true + }, "acorn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.5.tgz", - "integrity": "sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz", + "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==", "dev": true } } @@ -5007,9 +4920,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -5180,9 +5093,9 @@ } }, "source-map-support": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz", - "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", + "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -5236,9 +5149,9 @@ } }, "spdx-license-ids": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz", - "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz", + "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==", "dev": true }, "split-string": { @@ -5378,22 +5291,16 @@ } }, "terser": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.11.0.tgz", - "integrity": "sha512-5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.0.2.tgz", + "integrity": "sha512-IWLuJqTvx97KP3uTYkFVn93cXO+EtlzJu8TdJylq+H0VBDlPMIfQA9MBS5Vc5t3xTEUG1q0hIfHMpAP2R+gWTw==", "dev": true, "requires": { - "commander": "~2.17.1", + "commander": "^2.19.0", "source-map": "~0.6.1", - "source-map-support": "~0.5.6" + "source-map-support": "~0.5.10" }, "dependencies": { - "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", - "dev": true - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -5409,19 +5316,18 @@ "dev": true }, "through2": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz", - "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", + "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", "dev": true, "requires": { - "readable-stream": "2 || 3", - "xtend": "~4.0.1" + "readable-stream": "2 || 3" } }, "through2-filter": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", - "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", + "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", "dev": true, "requires": { "through2": "~2.0.0", @@ -5541,6 +5447,12 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, + "type": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/type/-/type-1.0.1.tgz", + "integrity": "sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw==", + "dev": true + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -5548,9 +5460,9 @@ "dev": true }, "typescript": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz", - "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz", + "integrity": "sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==", "dev": true }, "typescript-formatter": { @@ -5594,9 +5506,9 @@ "dev": true }, "undertaker": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.0.tgz", - "integrity": "sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz", + "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==", "dev": true, "requires": { "arr-flatten": "^1.0.1", @@ -5633,60 +5545,37 @@ } }, "unicode-match-property-value-ecmascript": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz", - "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz", + "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==", "dev": true }, "unicode-property-aliases-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz", - "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz", + "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==", "dev": true }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unique-stream": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", - "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz", + "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==", "dev": true, "requires": { - "json-stable-stringify": "^1.0.0", - "through2-filter": "^2.0.0" + "json-stable-stringify-without-jsonify": "^1.0.1", + "through2-filter": "^3.0.0" } }, "unset-value": { @@ -5730,9 +5619,9 @@ } }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", + "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", "dev": true }, "urix": { @@ -5754,9 +5643,9 @@ "dev": true }, "v8flags": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz", - "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", + "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==", "dev": true, "requires": { "homedir-polyfill": "^1.0.1" @@ -5863,6 +5752,17 @@ "now-and-later": "^2.0.0", "remove-bom-buffer": "^3.0.0", "vinyl": "^2.0.0" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } } }, "vinyl-sourcemaps-apply": { diff --git a/js/package.json b/js/package.json index 9db69eee91b..35ef4609401 100644 --- a/js/package.json +++ b/js/package.json @@ -17,15 +17,16 @@ "types": "src/index.d.ts", "browserslist": "> 0.25%, not dead", "devDependencies": { - "@babel/cli": "^7.2.3", - "@babel/core": "^7.2.2", - "@babel/plugin-transform-async-to-generator": "^7.2.0", - "@babel/polyfill": "^7.2.5", - "@babel/preset-env": "^7.2.3", + "@babel/cli": "^7.5.0", + "@babel/core": "^7.5.0", + "@babel/plugin-transform-async-to-generator": "^7.5.0", + "@babel/preset-env": "^7.5.0", "babel-plugin-rewrite-require": "^1.14.5", + "core-js": "^3.1.4", + "core-js-bundle": "^3.1.4", "del": "^3.0.0", "esprima": "^4.0.1", - "gulp": "^4.0.0", + "gulp": "^4.0.2", "gulp-babel": "^8.0.0", "gulp-concat": "^2.6.1", "gulp-ext-replace": "^0.3.0", @@ -33,19 +34,20 @@ "gulp-ice-builder": "^3.0.2", "gulp-newer": "^1.4.0", "gulp-rename": "^1.4.0", - "gulp-sourcemaps": "^2.6.4", - "gulp-terser": "^1.1.6", - "gulp-typescript": "^5.0.0", + "gulp-sourcemaps": "^2.6.5", + "gulp-terser": "^1.2.0", + "gulp-typescript": "^5.0.1", "gulp-uglifyes": "^0.2.1", "hogan.js": "^3.0.2", "http-proxy": "^1.17.0", - "jshint": "^2.9.7", + "jshint": "^2.10.2", "plugin-error": "^1.0.1", "pump": "^3.0.0", - "rollup": "^1.0.1", + "regenerator-runtime": "^0.13.2", + "rollup": "^1.16.6", "source-map": "^0.7.3", - "through2": "^3.0.0", - "typescript": "^3.2.2", + "through2": "^3.0.1", + "typescript": "^3.5.2", "typescript-formatter": "^7.2.2", "vinyl": "^2.2.0", "vinyl-paths": "^2.1.0" diff --git a/js/src/es5/index.js b/js/src/es5/index.js index 4955e6fc8ee..dcd714c820c 100644 --- a/js/src/es5/index.js +++ b/js/src/es5/index.js @@ -2,7 +2,9 @@ // Copyright (c) ZeroC, Inc. All rights reserved. // -require("@babel/polyfill"); +require("core-js/stable"); +require("regenerator-runtime/runtime"); + module.exports.Ice = require("./Ice/Ice").Ice; module.exports.IceMX = require("./Ice/Ice").IceMX; module.exports.IceSSL = require("./Ice/Ice").IceSSL; diff --git a/js/test/Common/TestSuites.json b/js/test/Common/TestSuites.json index 652d6c792f4..cc006b8c164 100644 --- a/js/test/Common/TestSuites.json +++ b/js/test/Common/TestSuites.json @@ -74,7 +74,7 @@ }, "Ice/objects": { - "files": ["Test.js", "Client.js", "InitialI.js", "Server.js"], + "files": ["Test.js", "Forward.js", "Client.js", "InitialI.js", "Server.js"], "testcases": [ { diff --git a/js/test/Ice/objects/.gitignore b/js/test/Ice/objects/.gitignore index d158d9308ba..e0c127372d7 100644 --- a/js/test/Ice/objects/.gitignore +++ b/js/test/Ice/objects/.gitignore @@ -1,2 +1,3 @@ Test.js +Forward.js index.html diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js index 6e8f7602c5c..23984ccaed8 100644 --- a/js/test/Ice/objects/Client.js +++ b/js/test/Ice/objects/Client.js @@ -6,6 +6,7 @@ { const Ice = require("ice").Ice; const Test = require("Test").Test; + require("Forward"); const TestHelper = require("TestHelper").TestHelper; const test = TestHelper.test; @@ -464,6 +465,29 @@ } out.writeLine("ok"); + out.write("testing forward declarations... "); + { + const [f11, f12] = await initial.opF1(new Test.F1("F11")); + test(f11.name == "F11"); + test(f12.name == "F12"); + + const [f21, f22] = await initial.opF2(Test.F2Prx.uncheckedCast(communicator.stringToProxy("F21"))); + test(f21.ice_getIdentity().name == "F21"); + test(f22.ice_getIdentity().name == "F22"); + + if(initial.hasF3()) + { + const [f31, f32] = await initial.opF3( + new Test.F3(new Test.F1("F11"), Test.F2Prx.uncheckedCast(communicator.stringToProxy("F21")))); + test(f31.f1.name == "F11"); + test(f31.f2.ice_getIdentity().name == "F21"); + + test(f32.f1.name == "F12"); + test(f32.f2.ice_getIdentity().name == "F22"); + } + } + out.writeLine("ok"); + await initial.shutdown(); } diff --git a/js/test/Ice/objects/Forward.ice b/js/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..5cc93e83b4a --- /dev/null +++ b/js/test/Ice/objects/Forward.ice @@ -0,0 +1,20 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/js/test/Ice/objects/InitialI.js b/js/test/Ice/objects/InitialI.js index 50e7af444bc..e6140642963 100644 --- a/js/test/Ice/objects/InitialI.js +++ b/js/test/Ice/objects/InitialI.js @@ -6,6 +6,7 @@ { const Ice = require("ice").Ice; const Test = require("Test").Test; + require("Forward"); class BI extends Test.B { @@ -322,6 +323,28 @@ return [v1, v1]; } + opF1(f11, current) + { + return [f11, new Test.F1("F12")]; + } + + opF2(f21, current) + { + return [f21, current.adapter.getCommunicator().stringToProxy("F22")]; + } + + opF3(f31, current) + { + return [f31, + new Test.F3(new Test.F1("F12"), + current.adapter.getCommunicator().stringToProxy("F22"))]; + } + + hasF3(current) + { + return true; + } + shutdown(current) { current.adapter.getCommunicator().shutdown(); diff --git a/js/test/Ice/objects/Server.js b/js/test/Ice/objects/Server.js index 3bd99210f48..fa55ce23596 100644 --- a/js/test/Ice/objects/Server.js +++ b/js/test/Ice/objects/Server.js @@ -6,6 +6,7 @@ { const Ice = require("ice").Ice; const Test = require("Test").Test; + require("Forward"); const TestHelper = require("TestHelper").TestHelper; const InitialI = require("InitialI").InitialI; diff --git a/js/test/Ice/objects/Test.ice b/js/test/Ice/objects/Test.ice index b908511f680..617deda65de 100644 --- a/js/test/Ice/objects/Test.ice +++ b/js/test/Ice/objects/Test.ice @@ -197,6 +197,16 @@ class M LMap v; } +// Forward declarations +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + interface Initial { void shutdown(); @@ -242,6 +252,11 @@ interface Initial void throwInnerSubEx() throws Inner::Sub::Ex; M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } class Empty diff --git a/matlab/test/Ice/objects/AllTests.m b/matlab/test/Ice/objects/AllTests.m index 1f799880dbe..6eecffbf426 100644 --- a/matlab/test/Ice/objects/AllTests.m +++ b/matlab/test/Ice/objects/AllTests.m @@ -270,6 +270,27 @@ classdef AllTests assert(strcmp(m2.v(2).value.data, 'two')); fprintf('ok\n'); + + fprintf('testing forward declarations... '); + + [f11, f12] = initial.opF1(F1('F11')); + assert(strcmp(f11.name, 'F11')); + assert(strcmp(f12.name, 'F12')); + + [f21, f22] = initial.opF2(F2Prx.uncheckedCast(communicator.stringToProxy('F21'))); + assert(strcmp(f21.ice_getIdentity().name, 'F21')); + assert(strcmp(f22.ice_getIdentity().name, 'F22')); + + if initial.hasF3() + [f31, f32] = initial.opF3(F3(f11, f21)); + assert(strcmp(f31.f1.name, 'F11')); + assert(strcmp(f31.f2.ice_getIdentity().name, 'F21')); + + assert(strcmp(f32.f1.name, 'F12')); + assert(strcmp(f32.f2.ice_getIdentity().name, 'F22')); + end + fprintf('ok\n'); + r = initial; end end diff --git a/matlab/test/Ice/objects/Forward.ice b/matlab/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..5cc93e83b4a --- /dev/null +++ b/matlab/test/Ice/objects/Forward.ice @@ -0,0 +1,20 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/matlab/test/Ice/objects/Test.ice b/matlab/test/Ice/objects/Test.ice index ab0d8c49d37..d05e6feff56 100644 --- a/matlab/test/Ice/objects/Test.ice +++ b/matlab/test/Ice/objects/Test.ice @@ -193,6 +193,16 @@ class M LMap v; } +// Forward declarations +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + interface Initial { void shutdown(); @@ -238,6 +248,11 @@ interface Initial void throwInnerSubEx() throws Inner::Sub::Ex; M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } class Empty diff --git a/objective-c/test/Ice/objects/AllTests.m b/objective-c/test/Ice/objects/AllTests.m index 3e148570879..673e2c8ef40 100644 --- a/objective-c/test/Ice/objects/AllTests.m +++ b/objective-c/test/Ice/objects/AllTests.m @@ -5,6 +5,7 @@ #import <objc/Ice.h> #import <TestCommon.h> #import <ObjectsTest.h> +#import <ObjectsForward.h> #if defined(__clang__) // For 'Ice::Communicator::findObjectFactory()' deprecation @@ -688,5 +689,20 @@ objectsAllTests(id<ICECommunicator> communicator, BOOL __unused collocated) tprintf("ok\n"); } + { + tprintf("testing forward declarations... "); + TestObjectsF1* f12; + TestObjectsF1* f11 = [initial opF1:[[TestObjectsF1 alloc] init:@"F11"] f12:&f12]; + test([f11.name isEqualToString:@"F11"]); + test([f12.name isEqualToString:@"F12"]); + + TestObjectsF2Prx* f22; + TestObjectsF2Prx* f21 = [initial opF2:[TestObjectsF2Prx uncheckedCast:[communicator stringToProxy:@"F21"]] + f22: &f22]; + test([[f21 ice_getIdentity].name isEqualToString:@"F21"]); + test([[f22 ice_getIdentity].name isEqualToString:@"F22"]); + tprintf("ok\n"); + } + return initial; } diff --git a/objective-c/test/Ice/objects/Makefile.mk b/objective-c/test/Ice/objects/Makefile.mk index 391c8265c3b..08a7bad516c 100644 --- a/objective-c/test/Ice/objects/Makefile.mk +++ b/objective-c/test/Ice/objects/Makefile.mk @@ -3,8 +3,11 @@ # $(test)_sliceflags := -I$(test) -$(test)_client_sources = Client.m ObjectsTest.ice ObjectsDerived.ice ObjectsDerivedEx.ice TestI.m AllTests.m -$(test)_server_sources = Server.m ObjectsTest.ice ObjectsDerived.ice ObjectsDerivedEx.ice TestI.m TestIntfI.m -$(test)_collocated_sources = Collocated.m ObjectsTest.ice ObjectsDerived.ice ObjectsDerivedEx.ice TestI.m TestIntfI.m AllTests.m +$(test)_client_sources = Client.m ObjectsForward.ice ObjectsTest.ice ObjectsDerived.ice \ + ObjectsDerivedEx.ice TestI.m AllTests.m +$(test)_server_sources = Server.m ObjectsForward.ice ObjectsTest.ice ObjectsDerived.ice \ + ObjectsDerivedEx.ice TestI.m TestIntfI.m +$(test)_collocated_sources = Collocated.m ObjectsForward.ice ObjectsTest.ice ObjectsDerived.ice \ + ObjectsDerivedEx.ice TestI.m TestIntfI.m AllTests.m tests += $(test) diff --git a/objective-c/test/Ice/objects/ObjectsForward.ice b/objective-c/test/Ice/objects/ObjectsForward.ice new file mode 100644 index 00000000000..f405db9f80c --- /dev/null +++ b/objective-c/test/Ice/objects/ObjectsForward.ice @@ -0,0 +1,22 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +["objc:prefix:TestObjects"] + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/objective-c/test/Ice/objects/ObjectsTest.ice b/objective-c/test/Ice/objects/ObjectsTest.ice index d7bfeabc1f0..b7919f45a9e 100644 --- a/objective-c/test/Ice/objects/ObjectsTest.ice +++ b/objective-c/test/Ice/objects/ObjectsTest.ice @@ -208,6 +208,10 @@ class M LMap v; } +// Forward declarations +class F1; +interface F2; + class Initial { void shutdown(); @@ -264,6 +268,11 @@ class Initial BaseDict getBaseDict(BaseDict d); BasePrxDict getBasePrxDict(BasePrxDict d); M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + + bool hasF3(); } interface TestIntf diff --git a/objective-c/test/Ice/objects/TestI.h b/objective-c/test/Ice/objects/TestI.h index c39c241acae..f89d8612f90 100644 --- a/objective-c/test/Ice/objects/TestI.h +++ b/objective-c/test/Ice/objects/TestI.h @@ -3,6 +3,7 @@ // #import <ObjectsTest.h> +#import <ObjectsForward.h> @interface TestObjectsBI : TestObjectsB<TestObjectsB> { @@ -66,7 +67,10 @@ -(TestObjectsObjectPrxDict *) getObjectPrxDict:(TestObjectsMutableObjectPrxDict *)d current:(ICECurrent *)current; -(TestObjectsBaseDict *) getBaseDict:(TestObjectsMutableBaseDict *)d current:(ICECurrent *)current; -(TestObjectsBasePrxDict *) getBasePrxDict:(TestObjectsMutableBasePrxDict *)d current:(ICECurrent *)current; - -(TestObjectsM *) opM:(TestObjectsM *)v1 v2:(TestObjectsM **)v2 current:(ICECurrent *)current; +-(TestObjectsM *) opM:(TestObjectsM *)v1 v2:(TestObjectsM **)v2 current:(ICECurrent *)current; +-(TestObjectsF1 *) opF1:(TestObjectsF1 *)f11 f12:(TestObjectsF1 **)f12 current:(ICECurrent *)current; +-(TestObjectsF2Prx *) opF2:(TestObjectsF2Prx *)f21 f22:(TestObjectsF2Prx **)f22 current:(ICECurrent *)current; +-(BOOL) hasF3:(ICECurrent *)current; @end @interface UnexpectedObjectExceptionTestI : ICEBlobject<ICEBlobject> diff --git a/objective-c/test/Ice/objects/TestI.m b/objective-c/test/Ice/objects/TestI.m index 5b86e3e94be..652b6ed360f 100644 --- a/objective-c/test/Ice/objects/TestI.m +++ b/objective-c/test/Ice/objects/TestI.m @@ -350,6 +350,23 @@ *v2 = v1; return v1; } + +-(TestObjectsF1 *) opF1:(TestObjectsF1 *)f11 f12:(TestObjectsF1 **)f12 current:(ICECurrent *)__unused current +{ + *f12 = [[TestObjectsF1 alloc] init:@"F12"]; + return f11; +} + +-(TestObjectsF2Prx *) opF2:(TestObjectsF2Prx *)f21 f22:(TestObjectsF2Prx **)f22 current:(ICECurrent *)__unused current +{ + *f22 = [TestObjectsF2Prx uncheckedCast:[[current.adapter getCommunicator] stringToProxy:@"F22"]]; + return f21; +} + +-(BOOL) hasF3:(ICECurrent *)__unused current +{ + return NO; +} @end @implementation UnexpectedObjectExceptionTestI diff --git a/php/test/Ice/objects/.gitignore b/php/test/Ice/objects/.gitignore index bed01730acc..5c33ecc88c0 100644 --- a/php/test/Ice/objects/.gitignore +++ b/php/test/Ice/objects/.gitignore @@ -1 +1,2 @@ Test.php +Forward.php diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php index b048c6fe4b0..0e653118147 100644 --- a/php/test/Ice/objects/Client.php +++ b/php/test/Ice/objects/Client.php @@ -5,6 +5,7 @@ $NS = function_exists("Ice\\initialize"); require_once('Test.php'); +require_once('Forward.php'); if($NS) { @@ -24,6 +25,8 @@ if($NS) interface Ice_ObjectFactory extends Ice\ObjectFactory {} interface Ice_ValueFactory extends Ice\ValueFactory {} class Test_L extends Test\L {} + class Test_F1 extends Test\F1 {} + class Test_F3 extends Test\F3 {} EOT; eval($code); } @@ -567,6 +570,29 @@ function allTests($helper) test($communicator->getValueFactoryManager()->find("TestOF") != null); echo "ok\n"; + echo "testing forward declarations... "; + $f12 = null; + $f11 = $initial->opF1(new Test_F1("F11"), $f12); + test($f11->name == "F11"); + test($f12->name == "F12"); + + $f22 = null; + $f21 = $initial->opF2($communicator->stringToProxy("F21")->ice_uncheckedCast("::Test::F2"), $f22); + test($f21->ice_getIdentity()->name == "F21"); + test($f22->ice_getIdentity()->name == "F22"); + + if($initial->hasF3()) + { + $f32 = null; + $f31 = $initial->opF3(new Test_F3($f11, $f22), $f32); + test($f31->f1->name == "F11"); + test($f31->f2->ice_getIdentity()->name = "F21"); + + test($f32->f1->name == "F12"); + test($f32->f2->ice_getIdentity()->name = "F22"); + } + echo "ok\n"; + return $initial; } diff --git a/php/test/Ice/objects/Forward.ice b/php/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..5cc93e83b4a --- /dev/null +++ b/php/test/Ice/objects/Forward.ice @@ -0,0 +1,20 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/php/test/Ice/objects/Test.ice b/php/test/Ice/objects/Test.ice index 08936064c4e..81fc72314b2 100644 --- a/php/test/Ice/objects/Test.ice +++ b/php/test/Ice/objects/Test.ice @@ -150,6 +150,16 @@ class L sequence<Value> ValueSeq; dictionary<string, Value> ValueMap; +// Forward declarations +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + interface Initial { void shutdown(); @@ -186,6 +196,11 @@ interface Initial BaseSeq opBaseSeq(BaseSeq inSeq, out BaseSeq outSeq); Compact getCompact(); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } class Empty diff --git a/python/test/Ice/objects/AllTests.py b/python/test/Ice/objects/AllTests.py index e47ca1d4089..d2b666a655b 100644 --- a/python/test/Ice/objects/AllTests.py +++ b/python/test/Ice/objects/AllTests.py @@ -335,4 +335,24 @@ def allTests(helper, communicator): print("ok") + sys.stdout.write("testing forward declarations... ") + sys.stdout.flush() + f11, f12 = initial.opF1(Test.F1("F11")) + test(f11.name == "F11") + test(f12.name == "F12") + + f21, f22 = initial.opF2(Test.F2Prx.uncheckedCast(communicator.stringToProxy("F21"))) + test(f21.ice_getIdentity().name == "F21") + test(f22.ice_getIdentity().name == "F22") + + if initial.hasF3(): + f31, f32 = initial.opF3(Test.F3(f11, f21)) + + test(f31.f1.name == "F11") + test(f31.f2.ice_getIdentity().name == "F21") + + test(f32.f1.name == "F12") + test(f32.f2.ice_getIdentity().name == "F22") + print("ok") + return initial diff --git a/python/test/Ice/objects/Client.py b/python/test/Ice/objects/Client.py index 441f6a1a83c..89cb791cc20 100755 --- a/python/test/Ice/objects/Client.py +++ b/python/test/Ice/objects/Client.py @@ -4,7 +4,7 @@ # from TestHelper import TestHelper -TestHelper.loadSlice("Test.ice ClientPrivate.ice") +TestHelper.loadSlice("Test.ice Forward.ice ClientPrivate.ice") import AllTests diff --git a/python/test/Ice/objects/Collocated.py b/python/test/Ice/objects/Collocated.py index ada3bc0d82b..ba6d78fd96e 100755 --- a/python/test/Ice/objects/Collocated.py +++ b/python/test/Ice/objects/Collocated.py @@ -4,7 +4,7 @@ # from TestHelper import TestHelper -TestHelper.loadSlice("Test.ice ClientPrivate.ice") +TestHelper.loadSlice("Test.ice Forward.ice ClientPrivate.ice") import Ice import TestI import AllTests diff --git a/python/test/Ice/objects/Forward.ice b/python/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..5cc93e83b4a --- /dev/null +++ b/python/test/Ice/objects/Forward.ice @@ -0,0 +1,20 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/python/test/Ice/objects/Server.py b/python/test/Ice/objects/Server.py index 033ac8911e9..2a9df124f4c 100755 --- a/python/test/Ice/objects/Server.py +++ b/python/test/Ice/objects/Server.py @@ -4,7 +4,7 @@ # from TestHelper import TestHelper -TestHelper.loadSlice("Test.ice ServerPrivate.ice") +TestHelper.loadSlice("Test.ice Forward.ice ServerPrivate.ice") import TestI import Ice diff --git a/python/test/Ice/objects/Test.ice b/python/test/Ice/objects/Test.ice index 3b4bf7807c9..e6e4828ffb9 100644 --- a/python/test/Ice/objects/Test.ice +++ b/python/test/Ice/objects/Test.ice @@ -193,6 +193,16 @@ class M LMap v; } +// Forward declarations +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + interface Initial { void shutdown(); @@ -238,6 +248,11 @@ interface Initial void throwInnerSubEx() throws Inner::Sub::Ex; M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } } diff --git a/python/test/Ice/objects/TestI.py b/python/test/Ice/objects/TestI.py index 921f5d8b485..e28c882a1bf 100644 --- a/python/test/Ice/objects/TestI.py +++ b/python/test/Ice/objects/TestI.py @@ -193,6 +193,19 @@ class InitialI(Test.Initial): def opM(self, m, current=None): return (m, m) + def opF1(self, f11, current=None): + return (f11, Test.F1("F12")) + + def opF2(self, f21, current=None): + return (f21, current.adapter.getCommunicator().stringToProxy("F22")) + + def opF3(self, f31, current): + return (f31, Test.F3(Test.F1("F12"), current.adapter.getCommunicator().stringToProxy("F22"))) + + def hasF3(self, current): + return True + + class UnexpectedObjectExceptionTestI(Test.UnexpectedObjectExceptionTest): def op(self, current=None): return Test.AlsoEmpty() diff --git a/ruby/test/Ice/objects/AllTests.rb b/ruby/test/Ice/objects/AllTests.rb index 69abd80f806..9e92f11131a 100644 --- a/ruby/test/Ice/objects/AllTests.rb +++ b/ruby/test/Ice/objects/AllTests.rb @@ -384,5 +384,24 @@ def allTests(helper, communicator) test(m2.v[k2].data == "two") puts "ok" + print "testing forward declarations... " + STDOUT.flush + f11, f12 = initial.opF1(Test::F1.new("F11")) + test(f11.name == "F11") + test(f12.name == "F12") + + f21, f22 = initial.opF2(Test::F2Prx::uncheckedCast(communicator.stringToProxy("F21"))) + test(f21.ice_getIdentity().name == "F21") + test(f22.ice_getIdentity().name == "F22") + + if initial.hasF3() then + f31, f32 = initial.opF3(Test::F3.new(f11, f21)) + test(f31.f1.name == "F11") + test(f31.f2.ice_getIdentity().name == "F21") + + test(f32.f1.name == "F12") + test(f32.f2.ice_getIdentity().name == "F22") + end + puts "ok" return initial end diff --git a/ruby/test/Ice/objects/Client.rb b/ruby/test/Ice/objects/Client.rb index 1e9516066b6..53d3faf3a14 100755 --- a/ruby/test/Ice/objects/Client.rb +++ b/ruby/test/Ice/objects/Client.rb @@ -5,6 +5,7 @@ require 'Ice' Ice::loadSlice('Test.ice') +Ice::loadSlice('Forward.ice') Ice::loadSlice('ClientPrivate.ice') require './AllTests' diff --git a/ruby/test/Ice/objects/Forward.ice b/ruby/test/Ice/objects/Forward.ice new file mode 100644 index 00000000000..5cc93e83b4a --- /dev/null +++ b/ruby/test/Ice/objects/Forward.ice @@ -0,0 +1,20 @@ +// +// Copyright (c) ZeroC, Inc. All rights reserved. +// + +#pragma once + +module Test +{ + +class F1 +{ + string name; +} + +interface F2 +{ + void op(); +} + +}; diff --git a/ruby/test/Ice/objects/Test.ice b/ruby/test/Ice/objects/Test.ice index d22849cb7cb..b4e0f3fd690 100644 --- a/ruby/test/Ice/objects/Test.ice +++ b/ruby/test/Ice/objects/Test.ice @@ -163,6 +163,16 @@ class M LMap v; } +// Forward declaration +class F1; +interface F2; + +class F3 +{ + F1 f1; + F2* f2; +} + class Initial { void shutdown(); @@ -202,6 +212,11 @@ class Initial Compact getCompact(); M opM(M v1, out M v2); + + F1 opF1(F1 f11, out F1 f12); + F2* opF2(F2* f21, out F2* f22); + F3 opF3(F3 f31, out F3 f32); + bool hasF3(); } } |