diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-05-11 17:50:09 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-05-11 17:50:09 -0400 |
| commit | ff76da01915482dc5c5bcc693789642882958d64 (patch) | |
| tree | b57639e7490f850fbec23c50f159c408689234e5 /cpp | |
| parent | cleaning up stream API in C++/Java/JS (diff) | |
| download | ice-ff76da01915482dc5c5bcc693789642882958d64.tar.bz2 ice-ff76da01915482dc5c5bcc693789642882958d64.tar.xz ice-ff76da01915482dc5c5bcc693789642882958d64.zip | |
IceUtil and Slice msbuild updates
Diffstat (limited to 'cpp')
124 files changed, 1121 insertions, 1488 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 37fa7f033d3..0ff96ce746d 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -123,9 +123,9 @@ #endif // -// Let's use these extensions with IceUtil: +// Let's use these extensions with Ice: // -#if defined(ICE_UTIL_API_EXPORTS) +#if defined(ICE_API_EXPORTS) # define ICE_UTIL_API ICE_DECLSPEC_EXPORT #elif defined(ICE_STATIC_LIBS) # define ICE_UTIL_API /**/ @@ -199,8 +199,8 @@ #define ICE_INT_VERSION 30751 // AABBCC, with AA=major, BB=minor, CC=patch #define ICE_SO_VERSION "37a0" // "ABC", with A=major, B=minor, C=patch -#if !defined(ICE_BUILDING_ICE_UTIL) && defined(ICE_UTIL_API_EXPORTS) -# define ICE_BUILDING_ICE_UTIL +#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS) +# define ICE_BUILDING_ICE #endif #if defined(_MSC_VER) @@ -239,11 +239,10 @@ # endif // -// Automatically link with IceUtil[D|++11|++11D].lib +// Automatically link with Ice[D|++11|++11D].lib // - -# ifndef ICE_BUILDING_ICE_UTIL -# pragma comment(lib, ICE_LIBNAME("IceUtil")) +# if !defined(ICE_STATIC_LIBS) && !defined(ICE_BUILDING_ICE) +# pragma comment(lib, ICE_LIBNAME("Ice")) # endif #endif diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index 7d5c478834d..ed07ceab344 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -54,12 +54,22 @@ typedef struct _stat64i32 structstat; #endif #ifdef _MSC_VER +#ifndef O_RDONLY # define O_RDONLY _O_RDONLY +#endif + +#ifndef O_BINARY # define O_BINARY _O_BINARY +#endif +#ifndef S_ISDIR # define S_ISDIR(mode) ((mode) & _S_IFDIR) +#endif + +#ifndef S_ISREG # define S_ISREG(mode) ((mode) & _S_IFREG) #endif +#endif #else diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index 67ba0b656bf..5a3ad0f4b14 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -16,17 +16,17 @@ namespace Slice { -SLICE_API extern FeatureProfile featureProfile; -SLICE_API extern std::string paramPrefix; +extern FeatureProfile featureProfile; +extern std::string paramPrefix; struct ToIfdef { - SLICE_API char operator()(char); + char operator()(char); }; -SLICE_API void printHeader(::IceUtilInternal::Output&); -SLICE_API void printVersionCheck(::IceUtilInternal::Output&); -SLICE_API void printDllExportStuff(::IceUtilInternal::Output&, const std::string&); +void printHeader(::IceUtilInternal::Output&); +void printVersionCheck(::IceUtilInternal::Output&); +void printDllExportStuff(::IceUtilInternal::Output&, const std::string&); const int TypeContextInParam = 1; const int TypeContextAMIEnd = 2; @@ -35,37 +35,37 @@ const int TypeContextAMICallPrivateEnd = 8; const int TypeContextUseWstring = 16; const int TypeContextLocal = 32; -SLICE_API bool isMovable(const TypePtr&); +bool isMovable(const TypePtr&); -SLICE_API std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0, bool = false); -SLICE_API std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); -SLICE_API std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); -SLICE_API std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); -SLICE_API std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); -SLICE_API std::string operationModeToString(Operation::Mode, bool cpp11 = false); -SLICE_API std::string opFormatTypeToString(const OperationPtr&); +std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0, bool = false); +std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); +std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); +std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); +std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false); +std::string operationModeToString(Operation::Mode, bool cpp11 = false); +std::string opFormatTypeToString(const OperationPtr&); -SLICE_API std::string fixKwd(const std::string&); +std::string fixKwd(const std::string&); -SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, bool, int, const std::string&, +void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, bool, int, const std::string&, bool, const StringList& = StringList(), int = 0, const std::string& = "", bool = true); -SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0); -SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0); -SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0, bool = false); +void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0); +void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0); +void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0, bool = false); -SLICE_API std::string getEndArg(const TypePtr&, const StringList&, const std::string&); -SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false); +std::string getEndArg(const TypePtr&, const StringList&, const std::string&); +void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false); -SLICE_API bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&); -SLICE_API bool findMetaData(const std::string&, const StringList&, std::string&); -SLICE_API std::string findMetaData(const StringList&, int = 0); -SLICE_API bool inWstringModule(const SequencePtr&); +bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&); +bool findMetaData(const std::string&, const StringList&, std::string&); +std::string findMetaData(const StringList&, int = 0); +bool inWstringModule(const SequencePtr&); -SLICE_API std::string getDataMemberRef(const DataMemberPtr&); +std::string getDataMemberRef(const DataMemberPtr&); -SLICE_API std::string classDefToDelegateString(const ClassDefPtr&, int = 0, bool = false); +std::string classDefToDelegateString(const ClassDefPtr&, int = 0, bool = false); } #endif diff --git a/cpp/include/Slice/Checksum.h b/cpp/include/Slice/Checksum.h index f686d16b6b8..3744d8a6ad4 100644 --- a/cpp/include/Slice/Checksum.h +++ b/cpp/include/Slice/Checksum.h @@ -19,7 +19,7 @@ namespace Slice typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap; -SLICE_API ChecksumMap createChecksums(const UnitPtr&); +ChecksumMap createChecksums(const UnitPtr&); } diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h index 84e12ade290..2401ae1db84 100644 --- a/cpp/include/Slice/CsUtil.h +++ b/cpp/include/Slice/CsUtil.h @@ -16,7 +16,7 @@ namespace Slice { -class SLICE_API CsGenerator : private ::IceUtil::noncopyable +class CsGenerator : private ::IceUtil::noncopyable { public: diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h index 3ecc251f71a..1c18c97742f 100644 --- a/cpp/include/Slice/FileTracker.h +++ b/cpp/include/Slice/FileTracker.h @@ -16,7 +16,7 @@ namespace Slice { -class SLICE_API FileException : public ::IceUtil::Exception +class FileException : public ::IceUtil::Exception { public: @@ -40,7 +40,7 @@ private: class FileTracker; typedef IceUtil::Handle<FileTracker> FileTrackerPtr; -class SLICE_API FileTracker : public ::IceUtil::SimpleShared +class FileTracker : public ::IceUtil::SimpleShared { public: diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h index 44d3d0cec45..6473f406e0e 100644 --- a/cpp/include/Slice/JavaUtil.h +++ b/cpp/include/Slice/JavaUtil.h @@ -19,22 +19,22 @@ namespace Slice // // Compute Java serialVersionUID for a Slice class // -SLICE_API long +long computeSerialVersionUUID(const ClassDefPtr&); // // Compute Java serialVersionUID for a Slice class // -SLICE_API long +long computeSerialVersionUUID(const ExceptionPtr&); // // Compute Java serialVersionUID for a Slice struct // -SLICE_API long +long computeSerialVersionUUID(const StructPtr&); -class SLICE_API JavaOutput : public ::IceUtilInternal::Output +class JavaOutput : public ::IceUtilInternal::Output { public: @@ -59,7 +59,7 @@ public: virtual void printHeader(); }; -class SLICE_API JavaGenerator : private ::IceUtil::noncopyable +class JavaGenerator : private ::IceUtil::noncopyable { public: diff --git a/cpp/include/Slice/ObjCUtil.h b/cpp/include/Slice/ObjCUtil.h index a83df6b7bc8..7c8236ede63 100644 --- a/cpp/include/Slice/ObjCUtil.h +++ b/cpp/include/Slice/ObjCUtil.h @@ -23,7 +23,7 @@ enum BaseType BaseTypeException }; -class SLICE_API ObjCGenerator : private ::IceUtil::noncopyable +class ObjCGenerator : private ::IceUtil::noncopyable { public: diff --git a/cpp/include/Slice/PHPUtil.h b/cpp/include/Slice/PHPUtil.h index 0e36995f5e1..e98130e9345 100644 --- a/cpp/include/Slice/PHPUtil.h +++ b/cpp/include/Slice/PHPUtil.h @@ -20,13 +20,13 @@ namespace PHP // // Convert a scoped name into a PHP name. // -SLICE_API std::string scopedToName(const std::string&, bool); +std::string scopedToName(const std::string&, bool); // // Check the given identifier against PHP's list of reserved words. If it matches // a reserved word, then an escaped version is returned with a leading underscore. // -SLICE_API std::string fixIdent(const std::string&); +std::string fixIdent(const std::string&); // // Get the fully-qualified name of the given definition. If a suffix is provided, @@ -36,13 +36,13 @@ SLICE_API std::string fixIdent(const std::string&); // COMPILERFIX: MSVC 6 seems to have a problem with const std::string // = std::string(), const std::string = std::string(). // -SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, bool, const std::string& = "", const std::string& = ""); +std::string getAbsolute(const Slice::ContainedPtr&, bool, const std::string& = "", const std::string& = ""); // // Since PHP uses the backslash character as the namespace separator, we have // to escape backslash characters when they appear in a string literal. // -SLICE_API std::string escapeName(const std::string&); +std::string escapeName(const std::string&); } } diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 9441e0793b9..a142ec921d0 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -20,27 +20,6 @@ #include <set> #include <stdio.h> -// -// Automatically link Slice[D|++11|++11D].lib with Visual C++ -// - -#if !defined(ICE_BUILDING_SLICE) && defined(SLICE_API_EXPORTS) -# define ICE_BUILDING_SLICE -#endif - -#if defined(_MSC_VER) && !defined(ICE_BUILDING_SLICE) -# pragma comment(lib, ICE_LIBNAME("Slice")) -#endif - -#ifndef SLICE_API -# if defined(ICE_STATIC_LIBS) -# define SLICE_API /**/ -# elif defined(SLICE_API_EXPORTS) -# define SLICE_API ICE_DECLSPEC_EXPORT -# else -# define SLICE_API ICE_DECLSPEC_IMPORT -# endif -#endif namespace Slice { @@ -183,7 +162,7 @@ struct OptionalDef // CICompare -- function object to do case-insensitive string comparison. // ---------------------------------------------------------------------- -class SLICE_API CICompare : public std::binary_function<std::string, std::string, bool> +class CICompare : public std::binary_function<std::string, std::string, bool> { public: @@ -191,7 +170,7 @@ public: }; #if defined(__SUNPRO_CC) -SLICE_API bool cICompare(const std::string&, const std::string&); +bool cICompare(const std::string&, const std::string&); #endif // ---------------------------------------------------------------------- @@ -199,7 +178,7 @@ SLICE_API bool cICompare(const std::string&, const std::string&); // most-derived to least-derived order. // ---------------------------------------------------------------------- -class SLICE_API DerivedToBaseCompare : public std::binary_function<std::string, std::string, bool> +class DerivedToBaseCompare : public std::binary_function<std::string, std::string, bool> { public: @@ -207,14 +186,14 @@ public: }; #if defined(__SUNPRO_CC) -SLICE_API bool derivedToBaseCompare(const ExceptionPtr&, const ExceptionPtr&); +bool derivedToBaseCompare(const ExceptionPtr&, const ExceptionPtr&); #endif // ---------------------------------------------------------------------- // ParserVisitor // ---------------------------------------------------------------------- -class SLICE_API ParserVisitor +class ParserVisitor { public: @@ -243,7 +222,7 @@ public: // DefinitionContext // ---------------------------------------------------------------------- -class SLICE_API DefinitionContext : public ::IceUtil::SimpleShared +class DefinitionContext : public ::IceUtil::SimpleShared { public: @@ -274,7 +253,7 @@ typedef ::IceUtil::Handle<DefinitionContext> DefinitionContextPtr; // GrammarBase // ---------------------------------------------------------------------- -class SLICE_API GrammarBase : public ::IceUtil::SimpleShared +class GrammarBase : public ::IceUtil::SimpleShared { }; @@ -282,7 +261,7 @@ class SLICE_API GrammarBase : public ::IceUtil::SimpleShared // SyntaxTreeBase // ---------------------------------------------------------------------- -class SLICE_API SyntaxTreeBase : public GrammarBase +class SyntaxTreeBase : public GrammarBase { public: @@ -303,7 +282,7 @@ protected: // Type // ---------------------------------------------------------------------- -class SLICE_API Type : public virtual SyntaxTreeBase +class Type : public virtual SyntaxTreeBase { public: @@ -322,7 +301,7 @@ protected: // Builtin // ---------------------------------------------------------------------- -class SLICE_API Builtin : public virtual Type +class Builtin : public virtual Type { public: @@ -365,7 +344,7 @@ protected: // Contained // ---------------------------------------------------------------------- -class SLICE_API Contained : public virtual SyntaxTreeBase +class Contained : public virtual SyntaxTreeBase { public: @@ -432,7 +411,7 @@ protected: // Container // ---------------------------------------------------------------------- -class SLICE_API Container : public virtual SyntaxTreeBase +class Container : public virtual SyntaxTreeBase { public: @@ -512,7 +491,7 @@ protected: // Module // ---------------------------------------------------------------------- -class SLICE_API Module : public virtual Container, public virtual Contained +class Module : public virtual Container, public virtual Contained { public: @@ -531,7 +510,7 @@ protected: // Constructed // ---------------------------------------------------------------------- -class SLICE_API Constructed : public virtual Type, public virtual Contained +class Constructed : public virtual Type, public virtual Contained { public: @@ -552,7 +531,7 @@ protected: // ClassDecl // ---------------------------------------------------------------------- -class SLICE_API ClassDecl : public virtual Constructed +class ClassDecl : public virtual Constructed { public: @@ -594,7 +573,7 @@ private: // Operation // ---------------------------------------------------------------------- -class SLICE_API Operation : public virtual Contained, public virtual Container +class Operation : public virtual Contained, public virtual Container { public: @@ -652,7 +631,7 @@ protected: // so if you need the class as a "constructed type", use the // declaration() operation to navigate to the class declaration. // -class SLICE_API ClassDef : public virtual Container, public virtual Contained +class ClassDef : public virtual Container, public virtual Contained { public: @@ -704,7 +683,7 @@ protected: // Proxy // ---------------------------------------------------------------------- -class SLICE_API Proxy : public virtual Type +class Proxy : public virtual Type { public: @@ -728,7 +707,7 @@ protected: // ---------------------------------------------------------------------- // No inheritance from Constructed, as this is not a Type -class SLICE_API Exception : public virtual Container, public virtual Contained +class Exception : public virtual Container, public virtual Contained { public: @@ -765,7 +744,7 @@ protected: // Struct // ---------------------------------------------------------------------- -class SLICE_API Struct : public virtual Container, public virtual Constructed +class Struct : public virtual Container, public virtual Constructed { public: @@ -793,7 +772,7 @@ protected: // Sequence // ---------------------------------------------------------------------- -class SLICE_API Sequence : public virtual Constructed +class Sequence : public virtual Constructed { public: @@ -821,7 +800,7 @@ protected: // Dictionary // ---------------------------------------------------------------------- -class SLICE_API Dictionary : public virtual Constructed +class Dictionary : public virtual Constructed { public: @@ -856,7 +835,7 @@ protected: // Enum // ---------------------------------------------------------------------- -class SLICE_API Enum : public virtual Constructed +class Enum : public virtual Constructed { public: @@ -890,7 +869,7 @@ protected: // Enumerator // ---------------------------------------------------------------------- -class SLICE_API Enumerator : public virtual Contained +class Enumerator : public virtual Contained { public: @@ -918,7 +897,7 @@ protected: // Const // ---------------------------------------------------------------------- -class SLICE_API Const : public virtual Contained +class Const : public virtual Contained { public: @@ -949,7 +928,7 @@ protected: // ParamDecl // ---------------------------------------------------------------------- -class SLICE_API ParamDecl : public virtual Contained +class ParamDecl : public virtual Contained { public: @@ -977,7 +956,7 @@ protected: // DataMember // ---------------------------------------------------------------------- -class SLICE_API DataMember : public virtual Contained +class DataMember : public virtual Contained { public: @@ -1013,7 +992,7 @@ protected: // Unit // ---------------------------------------------------------------------- -class SLICE_API Unit : public virtual Container +class Unit : public virtual Container { public: @@ -1114,7 +1093,7 @@ private: std::map< std::string, std::set<std::string> > _fileTopLevelModules; }; -extern SLICE_API Unit* unit; // The current parser for bison/flex +extern Unit* unit; // The current parser for bison/flex } diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index f38d1039146..80f8acf4d66 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -14,23 +14,13 @@ #include <IceUtil/Handle.h> #include <vector> -#ifndef SLICE_API -# if defined(ICE_STATIC_LIBS) -# define SLICE_API /**/ -# elif defined(SLICE_API_EXPORTS) -# define SLICE_API ICE_DECLSPEC_EXPORT -# else -# define SLICE_API ICE_DECLSPEC_IMPORT -# endif -#endif - namespace Slice { class Preprocessor; typedef IceUtil::Handle<Preprocessor> PreprocessorPtr; -class SLICE_API Preprocessor : public IceUtil::SimpleShared +class Preprocessor : public IceUtil::SimpleShared { public: diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h index 85af879c0b8..807fcfa1561 100644 --- a/cpp/include/Slice/PythonUtil.h +++ b/cpp/include/Slice/PythonUtil.h @@ -21,24 +21,24 @@ namespace Python // // Generate Python code for a translation unit. // -SLICE_API void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); +void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); // // Convert a scoped name into a Python name. // -SLICE_API std::string scopedToName(const std::string&); +std::string scopedToName(const std::string&); // // Check the given identifier against Python's list of reserved words. If it matches // a reserved word, then an escaped version is returned with a leading underscore. // -SLICE_API std::string fixIdent(const std::string&); +std::string fixIdent(const std::string&); // // Return the package specified in the global metadata for the given definition, // or an empty string if no metadata was found. // -SLICE_API std::string getPackageMetadata(const Slice::ContainedPtr&); +std::string getPackageMetadata(const Slice::ContainedPtr&); // // Get the fully-qualified name of the given definition, including any @@ -49,14 +49,14 @@ SLICE_API std::string getPackageMetadata(const Slice::ContainedPtr&); // COMPILERFIX: MSVC 6 seems to have a problem with const std::string // = std::string(), const std::string = std::string(). // -SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, const std::string& = "", const std::string& = ""); +std::string getAbsolute(const Slice::ContainedPtr&, const std::string& = "", const std::string& = ""); // // Emit a comment header. // -SLICE_API void printHeader(IceUtilInternal::Output&); +void printHeader(IceUtilInternal::Output&); -SLICE_API int compile(int, char*[]); +int compile(int, char*[]); } } diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h index c1309539882..3acae195d9c 100644 --- a/cpp/include/Slice/RubyUtil.h +++ b/cpp/include/Slice/RubyUtil.h @@ -21,7 +21,7 @@ namespace Ruby // // Generate Ruby code for a translation unit. // -SLICE_API void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); +void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); // // Check the given identifier against Ruby's list of reserved words. If it matches @@ -33,20 +33,20 @@ enum IdentStyle IdentToUpper, // Mapped identifier must begin with an upper-case letter. IdentToLower // Mapped identifier must begin with a lower-case letter. }; -SLICE_API std::string fixIdent(const std::string&, IdentStyle); +std::string fixIdent(const std::string&, IdentStyle); // // Get the fully-qualified name of the given definition. If a prefix is provided, // it is prepended to the definition's unqualified name. // -SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const std::string& = std::string()); +std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const std::string& = std::string()); // // Emit a comment header. // -SLICE_API void printHeader(IceUtilInternal::Output&); +void printHeader(IceUtilInternal::Output&); -SLICE_API int compile(int, char*[]); +int compile(int, char*[]); } } diff --git a/cpp/include/Slice/Util.h b/cpp/include/Slice/Util.h index 0755cbd0df4..a2ec69a87a2 100644 --- a/cpp/include/Slice/Util.h +++ b/cpp/include/Slice/Util.h @@ -19,19 +19,19 @@ namespace Slice { -SLICE_API std::string fullPath(const std::string&); -SLICE_API std::string changeInclude(const std::string&, const std::vector<std::string>&); -SLICE_API void setErrorStream(std::ostream&); -SLICE_API std::ostream& getErrorStream(); -SLICE_API void emitError(const std::string&, int, const std::string&); -SLICE_API void emitWarning(const std::string&, int, const std::string&); -SLICE_API void emitError(const std::string&, const std::string&, const std::string&); -SLICE_API void emitWarning(const std::string&, const std::string&, const std::string&); -SLICE_API void emitRaw(const char*); -SLICE_API std::vector<std::string> filterMcppWarnings(const std::string&); -SLICE_API void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//"); - -class SLICE_API DependOutputUtil : IceUtil::noncopyable +std::string fullPath(const std::string&); +std::string changeInclude(const std::string&, const std::vector<std::string>&); +void setErrorStream(std::ostream&); +std::ostream& getErrorStream(); +void emitError(const std::string&, int, const std::string&); +void emitWarning(const std::string&, int, const std::string&); +void emitError(const std::string&, const std::string&, const std::string&); +void emitWarning(const std::string&, const std::string&, const std::string&); +void emitRaw(const char*); +std::vector<std::string> filterMcppWarnings(const std::string&); +void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//"); + +class DependOutputUtil : IceUtil::noncopyable { public: diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index e53589f6ffb..a058545a715 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\acm\msbuild\client\client.vcxproj", "{CD25A05C-228D-473F-A86F-6C2DD22085B4}" ProjectSection(ProjectDependencies) = postProject diff --git a/cpp/msbuild/ice.uwp.sln b/cpp/msbuild/ice.uwp.sln index 3d160e5a3c7..a6b3c3cd8d8 100644 --- a/cpp/msbuild/ice.uwp.sln +++ b/cpp/msbuild/ice.uwp.sln @@ -3,12 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceutiluwp++11", "..\src\IceUtil\msbuild\iceutiluwp++11\iceutiluwp++11.vcxproj", "{045BD844-1D32-41AB-9824-BE11617A0097}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceuwp++11", "..\src\Ice\msbuild\iceuwp++11\iceuwp++11.vcxproj", "{31B3AC58-9642-4410-B16D-52A064AF3E55}" - ProjectSection(ProjectDependencies) = postProject - {045BD844-1D32-41AB-9824-BE11617A0097} = {045BD844-1D32-41AB-9824-BE11617A0097} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2uwp++11", "..\src\Glacier2Lib\msbuild\glacier2uwp++11\glacier2uwp++11.vcxproj", "{41C92ABD-AE22-4103-8334-3EBF3452E32E}" ProjectSection(ProjectDependencies) = postProject @@ -43,109 +38,97 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|ARM = Release|ARM - Release|x64 = Release|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {045BD844-1D32-41AB-9824-BE11617A0097}.Debug|ARM.ActiveCfg = Debug|ARM - {045BD844-1D32-41AB-9824-BE11617A0097}.Debug|ARM.Build.0 = Debug|ARM - {045BD844-1D32-41AB-9824-BE11617A0097}.Debug|x64.ActiveCfg = Debug|x64 - {045BD844-1D32-41AB-9824-BE11617A0097}.Debug|x64.Build.0 = Debug|x64 - {045BD844-1D32-41AB-9824-BE11617A0097}.Debug|Win32.ActiveCfg = Debug|Win32 - {045BD844-1D32-41AB-9824-BE11617A0097}.Debug|Win32.Build.0 = Debug|Win32 - {045BD844-1D32-41AB-9824-BE11617A0097}.Release|ARM.ActiveCfg = Release|ARM - {045BD844-1D32-41AB-9824-BE11617A0097}.Release|ARM.Build.0 = Release|ARM - {045BD844-1D32-41AB-9824-BE11617A0097}.Release|x64.ActiveCfg = Release|x64 - {045BD844-1D32-41AB-9824-BE11617A0097}.Release|x64.Build.0 = Release|x64 - {045BD844-1D32-41AB-9824-BE11617A0097}.Release|Win32.ActiveCfg = Release|Win32 - {045BD844-1D32-41AB-9824-BE11617A0097}.Release|Win32.Build.0 = Release|Win32 {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|ARM.ActiveCfg = Debug|ARM {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|ARM.Build.0 = Debug|ARM - {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|x64.ActiveCfg = Debug|x64 - {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|x64.Build.0 = Debug|x64 {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|Win32.ActiveCfg = Debug|Win32 {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|Win32.Build.0 = Debug|Win32 + {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|x64.ActiveCfg = Debug|x64 + {31B3AC58-9642-4410-B16D-52A064AF3E55}.Debug|x64.Build.0 = Debug|x64 {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|ARM.ActiveCfg = Release|ARM {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|ARM.Build.0 = Release|ARM - {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|x64.ActiveCfg = Release|x64 - {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|x64.Build.0 = Release|x64 {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|Win32.ActiveCfg = Release|Win32 {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|Win32.Build.0 = Release|Win32 + {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|x64.ActiveCfg = Release|x64 + {31B3AC58-9642-4410-B16D-52A064AF3E55}.Release|x64.Build.0 = Release|x64 {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|ARM.ActiveCfg = Debug|ARM {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|ARM.Build.0 = Debug|ARM - {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|x64.ActiveCfg = Debug|x64 - {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|x64.Build.0 = Debug|x64 {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|Win32.ActiveCfg = Debug|Win32 {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|Win32.Build.0 = Debug|Win32 + {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|x64.ActiveCfg = Debug|x64 + {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Debug|x64.Build.0 = Debug|x64 {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|ARM.ActiveCfg = Release|ARM {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|ARM.Build.0 = Release|ARM - {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|x64.ActiveCfg = Release|x64 - {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|x64.Build.0 = Release|x64 {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|Win32.ActiveCfg = Release|Win32 {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|Win32.Build.0 = Release|Win32 + {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|x64.ActiveCfg = Release|x64 + {41C92ABD-AE22-4103-8334-3EBF3452E32E}.Release|x64.Build.0 = Release|x64 {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|ARM.ActiveCfg = Debug|ARM {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|ARM.Build.0 = Debug|ARM - {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|x64.ActiveCfg = Debug|x64 - {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|x64.Build.0 = Debug|x64 {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|Win32.ActiveCfg = Debug|Win32 {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|Win32.Build.0 = Debug|Win32 + {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|x64.ActiveCfg = Debug|x64 + {4493C7D1-2063-418D-94B5-20A04602C2AA}.Debug|x64.Build.0 = Debug|x64 {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|ARM.ActiveCfg = Release|ARM {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|ARM.Build.0 = Release|ARM - {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|x64.ActiveCfg = Release|x64 - {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|x64.Build.0 = Release|x64 {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|Win32.ActiveCfg = Release|Win32 {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|Win32.Build.0 = Release|Win32 + {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|x64.ActiveCfg = Release|x64 + {4493C7D1-2063-418D-94B5-20A04602C2AA}.Release|x64.Build.0 = Release|x64 {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|ARM.ActiveCfg = Debug|ARM {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|ARM.Build.0 = Debug|ARM - {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|x64.ActiveCfg = Debug|x64 - {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|x64.Build.0 = Debug|x64 {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|Win32.ActiveCfg = Debug|Win32 {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|Win32.Build.0 = Debug|Win32 + {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|x64.ActiveCfg = Debug|x64 + {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Debug|x64.Build.0 = Debug|x64 {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|ARM.ActiveCfg = Release|ARM {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|ARM.Build.0 = Release|ARM - {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|x64.ActiveCfg = Release|x64 - {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|x64.Build.0 = Release|x64 {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|Win32.ActiveCfg = Release|Win32 {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|Win32.Build.0 = Release|Win32 + {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|x64.ActiveCfg = Release|x64 + {85997BFC-9FCF-4201-B158-8AA3227BECFC}.Release|x64.Build.0 = Release|x64 {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|ARM.ActiveCfg = Debug|ARM {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|ARM.Build.0 = Debug|ARM - {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|x64.ActiveCfg = Debug|x64 - {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|x64.Build.0 = Debug|x64 {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|Win32.ActiveCfg = Debug|Win32 {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|Win32.Build.0 = Debug|Win32 + {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|x64.ActiveCfg = Debug|x64 + {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Debug|x64.Build.0 = Debug|x64 {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|ARM.ActiveCfg = Release|ARM {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|ARM.Build.0 = Release|ARM - {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|x64.ActiveCfg = Release|x64 - {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|x64.Build.0 = Release|x64 {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|Win32.ActiveCfg = Release|Win32 {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|Win32.Build.0 = Release|Win32 + {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|x64.ActiveCfg = Release|x64 + {7D1CF8CC-C5EC-4E3C-AD49-0FCF007AFC0C}.Release|x64.Build.0 = Release|x64 {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|ARM.ActiveCfg = Debug|ARM {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|ARM.Build.0 = Debug|ARM - {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|x64.ActiveCfg = Debug|x64 - {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|x64.Build.0 = Debug|x64 {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|Win32.ActiveCfg = Debug|Win32 {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|Win32.Build.0 = Debug|Win32 + {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|x64.ActiveCfg = Debug|x64 + {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Debug|x64.Build.0 = Debug|x64 {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|ARM.ActiveCfg = Release|ARM {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|ARM.Build.0 = Release|ARM - {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|x64.ActiveCfg = Release|x64 - {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|x64.Build.0 = Release|x64 {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|Win32.ActiveCfg = Release|Win32 {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|Win32.Build.0 = Release|Win32 + {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|x64.ActiveCfg = Release|x64 + {CF6D2747-7CFB-4BA4-91D6-DAF1E0A084EE}.Release|x64.Build.0 = Release|x64 {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|ARM.ActiveCfg = Debug|ARM {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|ARM.Build.0 = Debug|ARM - {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|x64.ActiveCfg = Debug|x64 - {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|x64.Build.0 = Debug|x64 {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|Win32.ActiveCfg = Debug|Win32 {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|Win32.Build.0 = Debug|Win32 + {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|x64.ActiveCfg = Debug|x64 + {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Debug|x64.Build.0 = Debug|x64 {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|ARM.ActiveCfg = Release|ARM {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|ARM.Build.0 = Release|ARM - {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|x64.ActiveCfg = Release|x64 - {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|x64.Build.0 = Release|x64 {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|Win32.ActiveCfg = Release|Win32 {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|Win32.Build.0 = Release|Win32 + {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|x64.ActiveCfg = Release|x64 + {B8046DCC-D3B7-4DFD-8661-31FBCEB0E576}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cpp/msbuild/ice.v120.sln b/cpp/msbuild/ice.v120.sln index f1f9ee1568f..b4bb04c0561 100644 --- a/cpp/msbuild/ice.v120.sln +++ b/cpp/msbuild/ice.v120.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceutil", "..\src\IceUtil\msbuild\iceutil\iceutil.vcxproj", "{4D1A5110-3176-44BA-8BBB-57BF56519B9F}" EndProject @@ -47,7 +47,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2py", "..\src\slice2py EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" ProjectSection(ProjectDependencies) = postProject - {4D1A5110-3176-44BA-8BBB-57BF56519B9F} = {4D1A5110-3176-44BA-8BBB-57BF56519B9F} + {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice", "..\src\Ice\msbuild\ice\ice.vcxproj", "{6485EC94-6B47-428D-B42D-AAA11F08DB59}" @@ -205,284 +205,284 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2router", "..\src\Gl EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 Debug|Win32 = Debug|Win32 - Release|x64 = Release|x64 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Debug|x64.ActiveCfg = Debug|x64 - {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Debug|x64.Build.0 = Debug|x64 {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Debug|Win32.ActiveCfg = Debug|Win32 {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Debug|Win32.Build.0 = Debug|Win32 - {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|x64.ActiveCfg = Release|x64 - {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|x64.Build.0 = Release|x64 + {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Debug|x64.ActiveCfg = Debug|x64 + {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Debug|x64.Build.0 = Debug|x64 {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|Win32.ActiveCfg = Release|Win32 {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|Win32.Build.0 = Release|Win32 - {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|x64.ActiveCfg = Debug|x64 - {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|x64.Build.0 = Debug|x64 + {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|x64.ActiveCfg = Release|x64 + {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|x64.Build.0 = Release|x64 {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|Win32.ActiveCfg = Debug|Win32 {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|Win32.Build.0 = Debug|Win32 - {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Release|x64.ActiveCfg = Release|x64 - {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Release|x64.Build.0 = Release|x64 + {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|x64.ActiveCfg = Debug|x64 + {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|x64.Build.0 = Debug|x64 {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Release|Win32.ActiveCfg = Release|Win32 {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Release|Win32.Build.0 = Release|Win32 - {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Debug|x64.ActiveCfg = Debug|x64 - {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Debug|x64.Build.0 = Debug|x64 + {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Release|x64.ActiveCfg = Release|x64 + {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Release|x64.Build.0 = Release|x64 {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Debug|Win32.ActiveCfg = Debug|Win32 {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Debug|Win32.Build.0 = Debug|Win32 - {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Release|x64.ActiveCfg = Release|x64 - {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Release|x64.Build.0 = Release|x64 + {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Debug|x64.ActiveCfg = Debug|x64 + {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Debug|x64.Build.0 = Debug|x64 {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Release|Win32.ActiveCfg = Release|Win32 {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Release|Win32.Build.0 = Release|Win32 - {7BF9F3E4-46CA-491B-A349-624C45212A19}.Debug|x64.ActiveCfg = Debug|x64 - {7BF9F3E4-46CA-491B-A349-624C45212A19}.Debug|x64.Build.0 = Debug|x64 + {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Release|x64.ActiveCfg = Release|x64 + {763F88BB-37FD-4BCC-9D13-A7103596EA06}.Release|x64.Build.0 = Release|x64 {7BF9F3E4-46CA-491B-A349-624C45212A19}.Debug|Win32.ActiveCfg = Debug|Win32 {7BF9F3E4-46CA-491B-A349-624C45212A19}.Debug|Win32.Build.0 = Debug|Win32 - {7BF9F3E4-46CA-491B-A349-624C45212A19}.Release|x64.ActiveCfg = Release|x64 - {7BF9F3E4-46CA-491B-A349-624C45212A19}.Release|x64.Build.0 = Release|x64 + {7BF9F3E4-46CA-491B-A349-624C45212A19}.Debug|x64.ActiveCfg = Debug|x64 + {7BF9F3E4-46CA-491B-A349-624C45212A19}.Debug|x64.Build.0 = Debug|x64 {7BF9F3E4-46CA-491B-A349-624C45212A19}.Release|Win32.ActiveCfg = Release|Win32 {7BF9F3E4-46CA-491B-A349-624C45212A19}.Release|Win32.Build.0 = Release|Win32 - {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Debug|x64.ActiveCfg = Debug|x64 - {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Debug|x64.Build.0 = Debug|x64 + {7BF9F3E4-46CA-491B-A349-624C45212A19}.Release|x64.ActiveCfg = Release|x64 + {7BF9F3E4-46CA-491B-A349-624C45212A19}.Release|x64.Build.0 = Release|x64 {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Debug|Win32.ActiveCfg = Debug|Win32 {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Debug|Win32.Build.0 = Debug|Win32 - {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Release|x64.ActiveCfg = Release|x64 - {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Release|x64.Build.0 = Release|x64 + {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Debug|x64.ActiveCfg = Debug|x64 + {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Debug|x64.Build.0 = Debug|x64 {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Release|Win32.ActiveCfg = Release|Win32 {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Release|Win32.Build.0 = Release|Win32 - {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Debug|x64.ActiveCfg = Debug|x64 - {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Debug|x64.Build.0 = Debug|x64 + {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Release|x64.ActiveCfg = Release|x64 + {B8E063CB-1481-42CA-92F3-E96770EDD70E}.Release|x64.Build.0 = Release|x64 {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Debug|Win32.ActiveCfg = Debug|Win32 {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Debug|Win32.Build.0 = Debug|Win32 - {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Release|x64.ActiveCfg = Release|x64 - {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Release|x64.Build.0 = Release|x64 + {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Debug|x64.ActiveCfg = Debug|x64 + {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Debug|x64.Build.0 = Debug|x64 {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Release|Win32.ActiveCfg = Release|Win32 {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Release|Win32.Build.0 = Release|Win32 - {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Debug|x64.ActiveCfg = Debug|x64 - {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Debug|x64.Build.0 = Debug|x64 + {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Release|x64.ActiveCfg = Release|x64 + {A503D0D4-22BB-4BDB-B996-862D14DA3349}.Release|x64.Build.0 = Release|x64 {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Debug|Win32.ActiveCfg = Debug|Win32 {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Debug|Win32.Build.0 = Debug|Win32 - {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Release|x64.ActiveCfg = Release|x64 - {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Release|x64.Build.0 = Release|x64 + {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Debug|x64.ActiveCfg = Debug|x64 + {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Debug|x64.Build.0 = Debug|x64 {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Release|Win32.ActiveCfg = Release|Win32 {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Release|Win32.Build.0 = Release|Win32 - {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Debug|x64.ActiveCfg = Debug|x64 - {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Debug|x64.Build.0 = Debug|x64 + {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Release|x64.ActiveCfg = Release|x64 + {8DF85304-2A53-4C36-804F-5C6FA2F75ACF}.Release|x64.Build.0 = Release|x64 {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Debug|Win32.ActiveCfg = Debug|Win32 {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Debug|Win32.Build.0 = Debug|Win32 - {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Release|x64.ActiveCfg = Release|x64 - {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Release|x64.Build.0 = Release|x64 + {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Debug|x64.ActiveCfg = Debug|x64 + {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Debug|x64.Build.0 = Debug|x64 {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Release|Win32.ActiveCfg = Release|Win32 {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Release|Win32.Build.0 = Release|Win32 - {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Debug|x64.ActiveCfg = Debug|x64 - {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Debug|x64.Build.0 = Debug|x64 + {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Release|x64.ActiveCfg = Release|x64 + {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6}.Release|x64.Build.0 = Release|x64 {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Debug|Win32.ActiveCfg = Debug|Win32 {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Debug|Win32.Build.0 = Debug|Win32 - {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Release|x64.ActiveCfg = Release|x64 - {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Release|x64.Build.0 = Release|x64 + {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Debug|x64.ActiveCfg = Debug|x64 + {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Debug|x64.Build.0 = Debug|x64 {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Release|Win32.ActiveCfg = Release|Win32 {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Release|Win32.Build.0 = Release|Win32 - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Debug|x64.ActiveCfg = Debug|x64 - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Debug|x64.Build.0 = Debug|x64 + {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Release|x64.ActiveCfg = Release|x64 + {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6}.Release|x64.Build.0 = Release|x64 {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Debug|Win32.ActiveCfg = Debug|Win32 {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Debug|Win32.Build.0 = Debug|Win32 - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|x64.ActiveCfg = Release|x64 - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|x64.Build.0 = Release|x64 + {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Debug|x64.ActiveCfg = Debug|x64 + {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Debug|x64.Build.0 = Debug|x64 {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|Win32.ActiveCfg = Release|Win32 {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|Win32.Build.0 = Release|Win32 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|x64.ActiveCfg = Debug|x64 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|x64.Build.0 = Debug|x64 + {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|x64.ActiveCfg = Release|x64 + {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}.Release|x64.Build.0 = Release|x64 {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|Win32.ActiveCfg = Debug|Win32 {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|Win32.Build.0 = Debug|Win32 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|x64.ActiveCfg = Release|x64 - {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|x64.Build.0 = Release|x64 + {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|x64.ActiveCfg = Debug|x64 + {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Debug|x64.Build.0 = Debug|x64 {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|Win32.ActiveCfg = Release|Win32 {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|Win32.Build.0 = Release|Win32 - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Debug|x64.ActiveCfg = Debug|x64 - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Debug|x64.Build.0 = Debug|x64 + {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|x64.ActiveCfg = Release|x64 + {6485EC94-6B47-428D-B42D-AAA11F08DB59}.Release|x64.Build.0 = Release|x64 {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Debug|Win32.ActiveCfg = Debug|Win32 {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Debug|Win32.Build.0 = Debug|Win32 - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|x64.ActiveCfg = Release|x64 - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|x64.Build.0 = Release|x64 + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Debug|x64.ActiveCfg = Debug|x64 + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Debug|x64.Build.0 = Debug|x64 {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|Win32.ActiveCfg = Release|Win32 {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|Win32.Build.0 = Release|Win32 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|x64.ActiveCfg = Debug|x64 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|x64.Build.0 = Debug|x64 + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|x64.ActiveCfg = Release|x64 + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}.Release|x64.Build.0 = Release|x64 {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|Win32.ActiveCfg = Debug|Win32 {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|Win32.Build.0 = Debug|Win32 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|x64.ActiveCfg = Release|x64 - {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|x64.Build.0 = Release|x64 + {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|x64.ActiveCfg = Debug|x64 + {E6864F0D-B2ED-406A-B98C-F3668A680005}.Debug|x64.Build.0 = Debug|x64 {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|Win32.ActiveCfg = Release|Win32 {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|Win32.Build.0 = Release|Win32 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|x64.ActiveCfg = Debug|x64 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|x64.Build.0 = Debug|x64 + {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|x64.ActiveCfg = Release|x64 + {E6864F0D-B2ED-406A-B98C-F3668A680005}.Release|x64.Build.0 = Release|x64 {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|Win32.ActiveCfg = Debug|Win32 {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|Win32.Build.0 = Debug|Win32 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|x64.ActiveCfg = Release|x64 - {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|x64.Build.0 = Release|x64 + {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|x64.ActiveCfg = Debug|x64 + {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Debug|x64.Build.0 = Debug|x64 {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|Win32.ActiveCfg = Release|Win32 {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|Win32.Build.0 = Release|Win32 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|x64.ActiveCfg = Debug|x64 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|x64.Build.0 = Debug|x64 + {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|x64.ActiveCfg = Release|x64 + {994ADD25-20A0-4715-A3EC-9F86AFD481D0}.Release|x64.Build.0 = Release|x64 {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|Win32.ActiveCfg = Debug|Win32 {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|Win32.Build.0 = Debug|Win32 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|x64.ActiveCfg = Release|x64 - {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|x64.Build.0 = Release|x64 + {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|x64.ActiveCfg = Debug|x64 + {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Debug|x64.Build.0 = Debug|x64 {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|Win32.ActiveCfg = Release|Win32 {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|Win32.Build.0 = Release|Win32 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.ActiveCfg = Debug|x64 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.Build.0 = Debug|x64 + {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|x64.ActiveCfg = Release|x64 + {18BF13D3-85D3-43A5-8C96-E52EB0672F72}.Release|x64.Build.0 = Release|x64 {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.ActiveCfg = Debug|Win32 {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.Build.0 = Debug|Win32 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.ActiveCfg = Release|x64 - {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.Build.0 = Release|x64 + {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.ActiveCfg = Debug|x64 + {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.Build.0 = Debug|x64 {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.ActiveCfg = Release|Win32 {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.Build.0 = Release|Win32 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|x64.ActiveCfg = Debug|x64 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|x64.Build.0 = Debug|x64 + {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.ActiveCfg = Release|x64 + {519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.Build.0 = Release|x64 {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|Win32.ActiveCfg = Debug|Win32 {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|Win32.Build.0 = Debug|Win32 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|x64.ActiveCfg = Release|x64 - {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|x64.Build.0 = Release|x64 + {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|x64.ActiveCfg = Debug|x64 + {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Debug|x64.Build.0 = Debug|x64 {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|Win32.ActiveCfg = Release|Win32 {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|Win32.Build.0 = Release|Win32 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|x64.ActiveCfg = Debug|x64 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|x64.Build.0 = Debug|x64 + {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|x64.ActiveCfg = Release|x64 + {5A8CEAB6-9F57-495C-B554-F93F842A0A28}.Release|x64.Build.0 = Release|x64 {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|Win32.ActiveCfg = Debug|Win32 {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|Win32.Build.0 = Debug|Win32 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|x64.ActiveCfg = Release|x64 - {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|x64.Build.0 = Release|x64 + {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|x64.ActiveCfg = Debug|x64 + {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Debug|x64.Build.0 = Debug|x64 {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|Win32.ActiveCfg = Release|Win32 {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|Win32.Build.0 = Release|Win32 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|x64.ActiveCfg = Debug|x64 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|x64.Build.0 = Debug|x64 + {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|x64.ActiveCfg = Release|x64 + {588F90CA-62AC-4101-83FC-19AB9DB6B509}.Release|x64.Build.0 = Release|x64 {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|Win32.ActiveCfg = Debug|Win32 {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|Win32.Build.0 = Debug|Win32 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|x64.ActiveCfg = Release|x64 - {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|x64.Build.0 = Release|x64 + {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|x64.ActiveCfg = Debug|x64 + {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Debug|x64.Build.0 = Debug|x64 {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|Win32.ActiveCfg = Release|Win32 {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|Win32.Build.0 = Release|Win32 - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Debug|x64.ActiveCfg = Debug|x64 - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Debug|x64.Build.0 = Debug|x64 + {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|x64.ActiveCfg = Release|x64 + {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}.Release|x64.Build.0 = Release|x64 {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Debug|Win32.ActiveCfg = Debug|Win32 {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Debug|Win32.Build.0 = Debug|Win32 - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Release|x64.ActiveCfg = Release|x64 - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Release|x64.Build.0 = Release|x64 + {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Debug|x64.ActiveCfg = Debug|x64 + {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Debug|x64.Build.0 = Debug|x64 {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Release|Win32.ActiveCfg = Release|Win32 {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Release|Win32.Build.0 = Release|Win32 - {7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|x64.ActiveCfg = Debug|x64 - {7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|x64.Build.0 = Debug|x64 + {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Release|x64.ActiveCfg = Release|x64 + {1B745EA3-C97A-41BB-8E6F-64AAE992BE55}.Release|x64.Build.0 = Release|x64 {7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|Win32.ActiveCfg = Debug|Win32 {7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|Win32.Build.0 = Debug|Win32 - {7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|x64.ActiveCfg = Release|x64 - {7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|x64.Build.0 = Release|x64 + {7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|x64.ActiveCfg = Debug|x64 + {7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|x64.Build.0 = Debug|x64 {7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|Win32.ActiveCfg = Release|Win32 {7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|Win32.Build.0 = Release|Win32 - {43D54B43-526E-40CE-9945-81420C54A415}.Debug|x64.ActiveCfg = Debug|x64 - {43D54B43-526E-40CE-9945-81420C54A415}.Debug|x64.Build.0 = Debug|x64 + {7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|x64.ActiveCfg = Release|x64 + {7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|x64.Build.0 = Release|x64 {43D54B43-526E-40CE-9945-81420C54A415}.Debug|Win32.ActiveCfg = Debug|Win32 {43D54B43-526E-40CE-9945-81420C54A415}.Debug|Win32.Build.0 = Debug|Win32 - {43D54B43-526E-40CE-9945-81420C54A415}.Release|x64.ActiveCfg = Release|x64 - {43D54B43-526E-40CE-9945-81420C54A415}.Release|x64.Build.0 = Release|x64 + {43D54B43-526E-40CE-9945-81420C54A415}.Debug|x64.ActiveCfg = Debug|x64 + {43D54B43-526E-40CE-9945-81420C54A415}.Debug|x64.Build.0 = Debug|x64 {43D54B43-526E-40CE-9945-81420C54A415}.Release|Win32.ActiveCfg = Release|Win32 {43D54B43-526E-40CE-9945-81420C54A415}.Release|Win32.Build.0 = Release|Win32 - {8BCB4793-C004-459D-9605-272470D53A40}.Debug|x64.ActiveCfg = Debug|x64 - {8BCB4793-C004-459D-9605-272470D53A40}.Debug|x64.Build.0 = Debug|x64 + {43D54B43-526E-40CE-9945-81420C54A415}.Release|x64.ActiveCfg = Release|x64 + {43D54B43-526E-40CE-9945-81420C54A415}.Release|x64.Build.0 = Release|x64 {8BCB4793-C004-459D-9605-272470D53A40}.Debug|Win32.ActiveCfg = Debug|Win32 {8BCB4793-C004-459D-9605-272470D53A40}.Debug|Win32.Build.0 = Debug|Win32 - {8BCB4793-C004-459D-9605-272470D53A40}.Release|x64.ActiveCfg = Release|x64 - {8BCB4793-C004-459D-9605-272470D53A40}.Release|x64.Build.0 = Release|x64 + {8BCB4793-C004-459D-9605-272470D53A40}.Debug|x64.ActiveCfg = Debug|x64 + {8BCB4793-C004-459D-9605-272470D53A40}.Debug|x64.Build.0 = Debug|x64 {8BCB4793-C004-459D-9605-272470D53A40}.Release|Win32.ActiveCfg = Release|Win32 {8BCB4793-C004-459D-9605-272470D53A40}.Release|Win32.Build.0 = Release|Win32 - {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Debug|x64.ActiveCfg = Debug|x64 - {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Debug|x64.Build.0 = Debug|x64 + {8BCB4793-C004-459D-9605-272470D53A40}.Release|x64.ActiveCfg = Release|x64 + {8BCB4793-C004-459D-9605-272470D53A40}.Release|x64.Build.0 = Release|x64 {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Debug|Win32.ActiveCfg = Debug|Win32 {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Debug|Win32.Build.0 = Debug|Win32 - {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Release|x64.ActiveCfg = Release|x64 - {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Release|x64.Build.0 = Release|x64 + {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Debug|x64.ActiveCfg = Debug|x64 + {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Debug|x64.Build.0 = Debug|x64 {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Release|Win32.ActiveCfg = Release|Win32 {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Release|Win32.Build.0 = Release|Win32 - {F0B74B00-F252-4D38-A352-ED379CB196E9}.Debug|x64.ActiveCfg = Debug|x64 - {F0B74B00-F252-4D38-A352-ED379CB196E9}.Debug|x64.Build.0 = Debug|x64 + {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Release|x64.ActiveCfg = Release|x64 + {0E22B627-F1A6-4771-89DE-9E45FD51F124}.Release|x64.Build.0 = Release|x64 {F0B74B00-F252-4D38-A352-ED379CB196E9}.Debug|Win32.ActiveCfg = Debug|Win32 {F0B74B00-F252-4D38-A352-ED379CB196E9}.Debug|Win32.Build.0 = Debug|Win32 - {F0B74B00-F252-4D38-A352-ED379CB196E9}.Release|x64.ActiveCfg = Release|x64 - {F0B74B00-F252-4D38-A352-ED379CB196E9}.Release|x64.Build.0 = Release|x64 + {F0B74B00-F252-4D38-A352-ED379CB196E9}.Debug|x64.ActiveCfg = Debug|x64 + {F0B74B00-F252-4D38-A352-ED379CB196E9}.Debug|x64.Build.0 = Debug|x64 {F0B74B00-F252-4D38-A352-ED379CB196E9}.Release|Win32.ActiveCfg = Release|Win32 {F0B74B00-F252-4D38-A352-ED379CB196E9}.Release|Win32.Build.0 = Release|Win32 - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Debug|x64.ActiveCfg = Debug|x64 - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Debug|x64.Build.0 = Debug|x64 + {F0B74B00-F252-4D38-A352-ED379CB196E9}.Release|x64.ActiveCfg = Release|x64 + {F0B74B00-F252-4D38-A352-ED379CB196E9}.Release|x64.Build.0 = Release|x64 {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Debug|Win32.ActiveCfg = Debug|Win32 {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Debug|Win32.Build.0 = Debug|Win32 - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Release|x64.ActiveCfg = Release|x64 - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Release|x64.Build.0 = Release|x64 + {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Debug|x64.ActiveCfg = Debug|x64 + {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Debug|x64.Build.0 = Debug|x64 {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Release|Win32.ActiveCfg = Release|Win32 {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Release|Win32.Build.0 = Release|Win32 - {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Debug|x64.ActiveCfg = Debug|x64 - {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Debug|x64.Build.0 = Debug|x64 + {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Release|x64.ActiveCfg = Release|x64 + {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}.Release|x64.Build.0 = Release|x64 {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Debug|Win32.ActiveCfg = Debug|Win32 {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Debug|Win32.Build.0 = Debug|Win32 - {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Release|x64.ActiveCfg = Release|x64 - {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Release|x64.Build.0 = Release|x64 + {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Debug|x64.ActiveCfg = Debug|x64 + {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Debug|x64.Build.0 = Debug|x64 {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Release|Win32.ActiveCfg = Release|Win32 {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Release|Win32.Build.0 = Release|Win32 - {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Debug|x64.ActiveCfg = Debug|x64 - {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Debug|x64.Build.0 = Debug|x64 + {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Release|x64.ActiveCfg = Release|x64 + {8F1A1F99-DBE0-408D-99F7-D59142BD008C}.Release|x64.Build.0 = Release|x64 {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Debug|Win32.ActiveCfg = Debug|Win32 {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Debug|Win32.Build.0 = Debug|Win32 - {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Release|x64.ActiveCfg = Release|x64 - {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Release|x64.Build.0 = Release|x64 + {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Debug|x64.ActiveCfg = Debug|x64 + {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Debug|x64.Build.0 = Debug|x64 {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Release|Win32.ActiveCfg = Release|Win32 {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Release|Win32.Build.0 = Release|Win32 - {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Debug|x64.ActiveCfg = Debug|x64 - {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Debug|x64.Build.0 = Debug|x64 + {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Release|x64.ActiveCfg = Release|x64 + {1F4CA1BE-B405-400F-912E-F0CC7E369D59}.Release|x64.Build.0 = Release|x64 {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Debug|Win32.ActiveCfg = Debug|Win32 {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Debug|Win32.Build.0 = Debug|Win32 - {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|x64.ActiveCfg = Release|x64 - {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|x64.Build.0 = Release|x64 + {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Debug|x64.ActiveCfg = Debug|x64 + {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Debug|x64.Build.0 = Debug|x64 {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|Win32.ActiveCfg = Release|Win32 {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|Win32.Build.0 = Release|Win32 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|x64.ActiveCfg = Debug|x64 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|x64.Build.0 = Debug|x64 + {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|x64.ActiveCfg = Release|x64 + {48EF9416-336F-4FA5-A376-FDFB7726ADBA}.Release|x64.Build.0 = Release|x64 {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|Win32.ActiveCfg = Debug|Win32 {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|Win32.Build.0 = Debug|Win32 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|x64.ActiveCfg = Release|x64 - {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|x64.Build.0 = Release|x64 + {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|x64.ActiveCfg = Debug|x64 + {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Debug|x64.Build.0 = Debug|x64 {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|Win32.ActiveCfg = Release|Win32 {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|Win32.Build.0 = Release|Win32 - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|x64.ActiveCfg = Debug|x64 - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|x64.Build.0 = Debug|x64 + {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|x64.ActiveCfg = Release|x64 + {72FA68A9-49B6-4AB6-94AE-34BB03770A51}.Release|x64.Build.0 = Release|x64 {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|Win32.ActiveCfg = Debug|Win32 {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|Win32.Build.0 = Debug|Win32 - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Release|x64.ActiveCfg = Release|x64 - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Release|x64.Build.0 = Release|x64 + {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|x64.ActiveCfg = Debug|x64 + {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Debug|x64.Build.0 = Debug|x64 {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Release|Win32.ActiveCfg = Release|Win32 {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Release|Win32.Build.0 = Release|Win32 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|x64.ActiveCfg = Debug|x64 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|x64.Build.0 = Debug|x64 + {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Release|x64.ActiveCfg = Release|x64 + {64490115-464B-4DC3-B7C6-D0AF1B68B6F9}.Release|x64.Build.0 = Release|x64 {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|Win32.ActiveCfg = Debug|Win32 {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|Win32.Build.0 = Debug|Win32 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|x64.ActiveCfg = Release|x64 - {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|x64.Build.0 = Release|x64 + {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|x64.ActiveCfg = Debug|x64 + {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Debug|x64.Build.0 = Debug|x64 {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|Win32.ActiveCfg = Release|Win32 {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|Win32.Build.0 = Release|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.ActiveCfg = Debug|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.Build.0 = Debug|x64 + {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|x64.ActiveCfg = Release|x64 + {3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81}.Release|x64.Build.0 = Release|x64 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.ActiveCfg = Debug|Win32 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|Win32.Build.0 = Debug|Win32 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.ActiveCfg = Release|x64 - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.Build.0 = Release|x64 + {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.ActiveCfg = Debug|x64 + {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Debug|x64.Build.0 = Debug|x64 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|Win32.ActiveCfg = Release|Win32 {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|Win32.Build.0 = Release|Win32 - {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|x64.ActiveCfg = Debug|x64 - {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|x64.Build.0 = Debug|x64 + {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.ActiveCfg = Release|x64 + {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}.Release|x64.Build.0 = Release|x64 {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|Win32.ActiveCfg = Debug|Win32 {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|Win32.Build.0 = Debug|Win32 - {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Release|x64.ActiveCfg = Release|x64 - {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Release|x64.Build.0 = Release|x64 + {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|x64.ActiveCfg = Debug|x64 + {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Debug|x64.Build.0 = Debug|x64 {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Release|Win32.ActiveCfg = Release|Win32 {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Release|Win32.Build.0 = Release|Win32 + {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Release|x64.ActiveCfg = Release|x64 + {541CF1D6-95FD-4499-AB02-75CCCEE660B0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cpp/msbuild/ice.v140.sln b/cpp/msbuild/ice.v140.sln index de8e5edb529..a7e7df54754 100644 --- a/cpp/msbuild/ice.v140.sln +++ b/cpp/msbuild/ice.v140.sln @@ -1,12 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceutil", "..\src\IceUtil\msbuild\iceutil\iceutil.vcxproj", "{4D1A5110-3176-44BA-8BBB-57BF56519B9F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceutil++11", "..\src\IceUtil\msbuild\iceutil++11\iceutil++11.vcxproj", "{7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice", "..\src\Slice\msbuild\slice.vcxproj", "{57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}" ProjectSection(ProjectDependencies) = postProject {4D1A5110-3176-44BA-8BBB-57BF56519B9F} = {4D1A5110-3176-44BA-8BBB-57BF56519B9F} @@ -50,12 +48,11 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice++11", "..\src\Ice\msbuild\ice++11\ice++11.vcxproj", "{3AB9772C-6113-4F1C-90FB-5368E7486C11}" ProjectSection(ProjectDependencies) = postProject {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {763F88BB-37FD-4BCC-9D13-A7103596EA06} - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1} = {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" ProjectSection(ProjectDependencies) = postProject - {4D1A5110-3176-44BA-8BBB-57BF56519B9F} = {4D1A5110-3176-44BA-8BBB-57BF56519B9F} + {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice", "..\src\Ice\msbuild\ice\ice.vcxproj", "{6485EC94-6B47-428D-B42D-AAA11F08DB59}" @@ -273,14 +270,6 @@ Global {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|Win32.Build.0 = Release|Win32 {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|x64.ActiveCfg = Release|x64 {4D1A5110-3176-44BA-8BBB-57BF56519B9F}.Release|x64.Build.0 = Release|x64 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Debug|Win32.Build.0 = Debug|Win32 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Debug|x64.ActiveCfg = Debug|x64 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Debug|x64.Build.0 = Debug|x64 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Release|Win32.ActiveCfg = Release|Win32 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Release|Win32.Build.0 = Release|Win32 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Release|x64.ActiveCfg = Release|x64 - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}.Release|x64.Build.0 = Release|x64 {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|Win32.ActiveCfg = Debug|Win32 {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|Win32.Build.0 = Debug|Win32 {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A}.Debug|x64.ActiveCfg = Debug|x64 @@ -623,7 +612,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {4D1A5110-3176-44BA-8BBB-57BF56519B9F} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {57CD6AC2-0C9D-4648-9E9D-5DF60C90F18A} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {7BF9F3E4-46CA-491B-A349-624C45212A19} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj index ed7bf24ccb2..63a293747bc 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -732,7 +734,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj index 69442a2579c..01601b4f3d4 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj @@ -75,7 +75,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -83,7 +83,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -91,7 +91,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -99,7 +99,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -188,6 +188,7 @@ </CustomBuild> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\..\IceUtil\*.cpp" /> <ClCompile Include="..\..\Acceptor.cpp" /> <ClCompile Include="..\..\ACM.cpp" /> <ClCompile Include="..\..\Application.cpp" /> diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters index e892ad860af..13df6b362e1 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -953,6 +953,9 @@ <ClCompile Include="x64\Release\Version.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> + <ClCompile Include="..\..\..\IceUtil\*.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\EventLoggerMsg.mc"> @@ -1432,4 +1435,4 @@ <Filter>Header Files\x64\Release</Filter> </ClInclude> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj index 917cfae4c56..4cc4cd8cd87 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -80,7 +80,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -88,7 +88,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -96,7 +96,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -104,7 +104,7 @@ <PreprocessorDefinitions>ICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib</AdditionalDependencies> + <AdditionalDependencies>advapi32.lib;ws2_32.lib;Iphlpapi.lib;rpcrt4.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -193,6 +193,7 @@ </CustomBuild> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\..\IceUtil\*.cpp" /> <ClCompile Include="..\..\Acceptor.cpp" /> <ClCompile Include="..\..\ACM.cpp" /> <ClCompile Include="..\..\Application.cpp" /> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters index e4aae5c48c4..cb39feea931 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -952,6 +952,9 @@ <ClCompile Include="x64\Release\Version.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> + <ClCompile Include="..\..\..\IceUtil\*.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="packages.config" /> @@ -1431,4 +1434,4 @@ <Filter>Header Files\x64\Release</Filter> </ClInclude> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj index 6c344dba9c9..baebb88fec5 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -134,6 +136,28 @@ </ClCompile> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\IceUtil\ArgVector.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Cond.cpp" /> + <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp" /> + <ClCompile Include="..\..\..\IceUtil\CountDownLatch.cpp" /> + <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Options.cpp" /> + <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Random.cpp" /> + <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp" /> + <ClCompile Include="..\..\..\IceUtil\SHA1.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Shared.cpp" /> + <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp" /> + <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Thread.cpp" /> + <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Time.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Timer.cpp" /> + <ClCompile Include="..\..\..\IceUtil\Unicode.cpp" /> + <ClCompile Include="..\..\..\IceUtil\UtilException.cpp" /> + <ClCompile Include="..\..\..\IceUtil\UUID.cpp" /> <ClCompile Include="..\..\Acceptor.cpp" /> <ClCompile Include="..\..\ACM.cpp" /> <ClCompile Include="..\..\AsyncResult.cpp" /> @@ -3543,7 +3567,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters index 37d9166831a..a2eeca3b49e 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Header Files"> @@ -1036,6 +1036,72 @@ <ClCompile Include="x64\Release\Version.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> + <ClCompile Include="..\..\..\IceUtil\ArgVector.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Cond.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\CountDownLatch.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Options.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Random.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\SHA1.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Shared.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Thread.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Time.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Timer.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\Unicode.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\UtilException.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\IceUtil\UUID.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice"> @@ -1860,4 +1926,4 @@ <Filter>Header Files\x64\Release</Filter> </ClInclude> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj index 868a539fd62..4f4204f988c 100644 --- a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj +++ b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -191,7 +193,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj index 9edf4c62c57..6e0bcb71b16 100644 --- a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -816,7 +818,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj index 51b833acbb0..4c5c788da1f 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -191,7 +193,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj index d19d01fb635..2b35204da8a 100644 --- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -314,7 +316,7 @@ <ClInclude Include="..\..\uwp\TransceiverI.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj index e16c1b72654..a6ad8ec6525 100644 --- a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj @@ -35,6 +35,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -306,7 +308,7 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc deleted file mode 100644 index ec47aa3c60e..00000000000 --- a/cpp/src/IceUtil/IceUtil.rc +++ /dev/null @@ -1,38 +0,0 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,51,0 - PRODUCTVERSION 3,7,51,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "iceutil37a0d\0" - #define ORIGINALFILENAME "iceutil37a0d.dll\0" -#else - FILEFLAGS 0x0L - #define INTERNALNAME "iceutil37a0\0" - #define ORIGINALFILENAME "iceutil37a0.dll\0" -#endif - FILEOS 0x4L - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "ZeroC, Inc.\0" - VALUE "FileDescription", "Ice C++ Utility Library\0" - VALUE "FileVersion", "3.7a0\0" - VALUE "InternalName", INTERNALNAME - VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" - VALUE "OriginalFilename", ORIGINALFILENAME - VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7a0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj deleted file mode 100644 index f22527e8f3f..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}</ProjectGuid> - <RootNamespace>IceUtil C++11</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp" /> - <ClCompile Include="..\..\Cond.cpp" /> - <ClCompile Include="..\..\ConvertUTF.cpp" /> - <ClCompile Include="..\..\CountDownLatch.cpp" /> - <ClCompile Include="..\..\CtrlCHandler.cpp" /> - <ClCompile Include="..\..\UtilException.cpp" /> - <ClCompile Include="..\..\FileUtil.cpp" /> - <ClCompile Include="..\..\InputUtil.cpp" /> - <ClCompile Include="..\..\MutexProtocol.cpp" /> - <ClCompile Include="..\..\Options.cpp" /> - <ClCompile Include="..\..\OutputUtil.cpp" /> - <ClCompile Include="..\..\Random.cpp" /> - <ClCompile Include="..\..\RecMutex.cpp" /> - <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\Shared.cpp" /> - <ClCompile Include="..\..\StringConverter.cpp" /> - <ClCompile Include="..\..\StringUtil.cpp" /> - <ClCompile Include="..\..\Thread.cpp" /> - <ClCompile Include="..\..\ThreadException.cpp" /> - <ClCompile Include="..\..\Time.cpp" /> - <ClCompile Include="..\..\Timer.cpp" /> - <ClCompile Include="..\..\Unicode.cpp" /> - <ClCompile Include="..\..\UUID.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" /> - <ClInclude Include="..\..\ArgVector.h" /> - <ClInclude Include="..\..\ConvertUTF.h" /> - <ClInclude Include="..\..\StopWatch.h" /> - <ClInclude Include="..\..\Unicode.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters deleted file mode 100644 index c097d85db0f..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{47ED10C7-EC63-4EA7-A7AE-D7378402851B}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{11279344-6550-4CA2-9A43-20B50E3BDD4B}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{84B010E6-6952-4B4B-A751-C6F9CDF443F4}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Cond.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ConvertUTF.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\CountDownLatch.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\CtrlCHandler.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UtilException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\FileUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\InputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\MutexProtocol.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Options.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\OutputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Random.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\RecMutex.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\SHA1.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Shared.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringConverter.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Thread.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ThreadException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Time.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Timer.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Unicode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UUID.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\ArgVector.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\ConvertUTF.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\StopWatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\Unicode.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> -</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj index 4a824edef45..eda08cf157d 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -25,22 +25,22 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> @@ -62,37 +62,53 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile /> <Link> <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> </Link> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\ArgVector.cpp" /> @@ -165,10 +181,7 @@ <ClInclude Include="..\..\StopWatch.h" /> <ClInclude Include="..\..\Unicode.h" /> </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters index f008d4bf690..b60350fc4d0 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -219,9 +219,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\IceUtil.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj deleted file mode 100644 index f1812c98174..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{045BD844-1D32-41AB-9824-BE11617A0097}</ProjectGuid> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Store</ApplicationType> - <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> - <ApplicationTypeRevision>10.0</ApplicationTypeRevision> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Lib> - <AdditionalDependencies> - </AdditionalDependencies> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp" /> - <ClCompile Include="..\..\Cond.cpp" /> - <ClCompile Include="..\..\ConvertUTF.cpp" /> - <ClCompile Include="..\..\CountDownLatch.cpp" /> - <ClCompile Include="..\..\UtilException.cpp" /> - <ClCompile Include="..\..\FileUtil.cpp" /> - <ClCompile Include="..\..\InputUtil.cpp" /> - <ClCompile Include="..\..\MutexProtocol.cpp" /> - <ClCompile Include="..\..\Options.cpp" /> - <ClCompile Include="..\..\OutputUtil.cpp" /> - <ClCompile Include="..\..\Random.cpp" /> - <ClCompile Include="..\..\RecMutex.cpp" /> - <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\Shared.cpp" /> - <ClCompile Include="..\..\StringConverter.cpp" /> - <ClCompile Include="..\..\StringUtil.cpp" /> - <ClCompile Include="..\..\Thread.cpp" /> - <ClCompile Include="..\..\ThreadException.cpp" /> - <ClCompile Include="..\..\Time.cpp" /> - <ClCompile Include="..\..\Timer.cpp" /> - <ClCompile Include="..\..\Unicode.cpp" /> - <ClCompile Include="..\..\UUID.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" /> - <ClInclude Include="..\..\ArgVector.h" /> - <ClInclude Include="..\..\ConvertUTF.h" /> - <ClInclude Include="..\..\StopWatch.h" /> - <ClInclude Include="..\..\Unicode.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters deleted file mode 100644 index 1c5653d5a4e..00000000000 --- a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters +++ /dev/null @@ -1,216 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\..\ArgVector.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ConvertUTF.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Cond.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\CountDownLatch.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UtilException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\FileUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\InputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\MutexProtocol.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Options.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\OutputUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Random.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\RecMutex.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\SHA1.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Unicode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Timer.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Time.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\ThreadException.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Thread.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringConverter.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Shared.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\StringUtil.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\UUID.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\ArgVector.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Config.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\ConvertUTF.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Options.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Random.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\StopWatch.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Time.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\Unicode.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{61a65a3d-af61-4bb7-b532-a2ec945fbc84}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{ef63f803-e282-4ddb-a5b9-9dfc079b26be}</UniqueIdentifier> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{4a95b250-fe90-4762-9440-47baf982c6c4}</UniqueIdentifier> - </Filter> - </ItemGroup> -</Project> diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h index 25d30c8086c..e11ec472a4b 100644 --- a/cpp/src/Slice/GrammarUtil.h +++ b/cpp/src/Slice/GrammarUtil.h @@ -48,7 +48,7 @@ typedef ::IceUtil::Handle<ClassIdTok> ClassIdTokPtr; // StringTok // ---------------------------------------------------------------------- -class SLICE_API StringTok : public GrammarBase +class StringTok : public GrammarBase { public: @@ -61,7 +61,7 @@ public: // StringListTok // ---------------------------------------------------------------------- -class SLICE_API StringListTok : public GrammarBase +class StringListTok : public GrammarBase { public: @@ -73,7 +73,7 @@ public: // TypeStringTok // ---------------------------------------------------------------------- -class SLICE_API TypeStringTok : public GrammarBase +class TypeStringTok : public GrammarBase { public: @@ -85,7 +85,7 @@ public: // TypeStringListTok // ---------------------------------------------------------------------- -class SLICE_API TypeStringListTok : public GrammarBase +class TypeStringListTok : public GrammarBase { public: @@ -97,7 +97,7 @@ public: // IntegerTok // ---------------------------------------------------------------------- -class SLICE_API IntegerTok : public GrammarBase +class IntegerTok : public GrammarBase { public: @@ -110,7 +110,7 @@ public: // FloatingTok // ---------------------------------------------------------------------- -class SLICE_API FloatingTok : public GrammarBase +class FloatingTok : public GrammarBase { public: @@ -123,7 +123,7 @@ public: // BoolTok // ---------------------------------------------------------------------- -class SLICE_API BoolTok : public GrammarBase +class BoolTok : public GrammarBase { public: @@ -135,7 +135,7 @@ public: // ExceptionListTok // ---------------------------------------------------------------------- -class SLICE_API ExceptionListTok : public GrammarBase +class ExceptionListTok : public GrammarBase { public: @@ -147,7 +147,7 @@ public: // ClassListTok // ---------------------------------------------------------------------- -class SLICE_API ClassListTok : public GrammarBase +class ClassListTok : public GrammarBase { public: @@ -159,7 +159,7 @@ public: // EnumeratorListTok // ---------------------------------------------------------------------- -class SLICE_API EnumeratorListTok : public GrammarBase +class EnumeratorListTok : public GrammarBase { public: @@ -171,7 +171,7 @@ public: // ConstDefTok // ---------------------------------------------------------------------- -class SLICE_API ConstDefTok : public GrammarBase +class ConstDefTok : public GrammarBase { public: @@ -183,7 +183,7 @@ public: // OptionalDefTok // ---------------------------------------------------------------------- -class SLICE_API OptionalDefTok : public GrammarBase +class OptionalDefTok : public GrammarBase { public: @@ -195,7 +195,7 @@ public: // ClassIdTok // ---------------------------------------------------------------------- -class SLICE_API ClassIdTok : public GrammarBase +class ClassIdTok : public GrammarBase { public: diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc deleted file mode 100644 index 0f90d5b8279..00000000000 --- a/cpp/src/Slice/Slice.rc +++ /dev/null @@ -1,38 +0,0 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,51,0 - PRODUCTVERSION 3,7,51,0 - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG - #define INTERNALNAME "slice37a0d\0" - #define ORIGINALFILENAME "slice37a0d.dll\0" -#else - FILEFLAGS 0x0L - #define INTERNALNAME "slice37a0\0" - #define ORIGINALFILENAME "slice37a0.dll\0" -#endif - FILEOS 0x4L - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "ZeroC, Inc.\0" - VALUE "FileDescription", "Slice C++ Library\0" - VALUE "FileVersion", "3.7a0\0" - VALUE "InternalName", INTERNALNAME - VALUE "LegalCopyright", "\251 2003-2016 ZeroC, Inc.\0" - VALUE "OriginalFilename", ORIGINALFILENAME - VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.7a0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END diff --git a/cpp/src/Slice/msbuild/packages.config b/cpp/src/Slice/msbuild/packages.config deleted file mode 100644 index c12391e1a04..00000000000 --- a/cpp/src/Slice/msbuild/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="mcpp.v120" version="2.7.2.6" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.6" targetFramework="native" /> -</packages>
\ No newline at end of file diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj index fb9d0403baa..5b5fcfe2651 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj +++ b/cpp/src/Slice/msbuild/slice.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -25,22 +25,22 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> @@ -63,30 +63,41 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <TargetExt>.lib</TargetExt> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <TargetExt>.lib</TargetExt> + <TargetName>$(ProjectName)d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <TargetExt>.lib</TargetExt> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PreprocessorDefinitions>SLICE_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> - <ResourceCompile Include="..\Slice.rc" /> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\Checksum.cpp" /> <ClCompile Include="..\CPlusPlusUtil.cpp" /> <ClCompile Include="..\CsUtil.cpp" /> @@ -126,19 +137,6 @@ <ClInclude Include="..\MD5.h" /> <ClInclude Include="..\MD5I.h" /> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets')" /> - </ImportGroup> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.6\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.6\build\native\mcpp.v140.targets'))" /> - </Target> -</Project> + <ImportGroup Label="ExtensionTargets" /> +</Project>
\ No newline at end of file diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters index 9f612ab2529..87d2f04a427 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj.filters +++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -15,11 +15,6 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\Slice.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\Checksum.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -131,7 +126,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2cpp/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj index 0f33beaa558..fe49979724f 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj @@ -63,6 +63,38 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> <ClCompile Include="..\Main.cpp" /> @@ -73,7 +105,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters index f1ac54f4fa2..7da0829adee 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2cs/msbuild/packages.config b/cpp/src/slice2cs/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2cs/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj index dd9f1800f42..8d7ce1afc3f 100644 --- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj +++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj @@ -66,22 +66,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -93,7 +109,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters index 76563adba5b..8475e9c7071 100644 --- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters +++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2html/msbuild/packages.config b/cpp/src/slice2html/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2html/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj b/cpp/src/slice2html/msbuild/slice2html.vcxproj index 7d41241f4b9..493cdedce11 100644 --- a/cpp/src/slice2html/msbuild/slice2html.vcxproj +++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj @@ -66,22 +66,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -93,7 +109,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters b/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters index ace683b23cf..d600de331c4 100644 --- a/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters +++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2java/msbuild/packages.config b/cpp/src/slice2java/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2java/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj index c6149ed65db..b0e7a00ae80 100644 --- a/cpp/src/slice2java/msbuild/slice2java.vcxproj +++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj @@ -66,22 +66,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -93,7 +109,27 @@ <ItemGroup> <ClInclude Include="..\Gen.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters b/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters index 48e5f9c9a3a..0651fe8a1f4 100644 --- a/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters +++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj.filters @@ -32,4 +32,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2js/msbuild/packages.config b/cpp/src/slice2js/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2js/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj index e0620640b12..4a1663a1a20 100644 --- a/cpp/src/slice2js/msbuild/slice2js.vcxproj +++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj @@ -65,22 +65,38 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Gen.cpp" /> @@ -94,7 +110,27 @@ <ClInclude Include="..\Gen.h" /> <ClInclude Include="..\JsUtil.h" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters b/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters index 67b5955b8b1..20badfb10f7 100644 --- a/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters +++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj.filters @@ -38,4 +38,7 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/packages.config b/cpp/src/slice2php/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2php/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj index e56df0b6e16..303363cf4fe 100644 --- a/cpp/src/slice2php/msbuild/slice2php.vcxproj +++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj @@ -63,13 +63,65 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Main.cpp" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\Slice2PHP.rc" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters index 03614f8fa86..62800ba8a81 100644 --- a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters +++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters @@ -24,4 +24,7 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2py/msbuild/packages.config b/cpp/src/slice2py/msbuild/packages.config new file mode 100644 index 00000000000..88735dc0077 --- /dev/null +++ b/cpp/src/slice2py/msbuild/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> +</packages>
\ No newline at end of file diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj index ec0c7eb46ea..1777cc1d8fd 100644 --- a/cpp/src/slice2py/msbuild/slice2py.vcxproj +++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj @@ -63,13 +63,65 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Main.cpp" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\Slice2Py.rc" /> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> + <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> + </ProjectReference> + <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj"> + <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> </ImportGroup> -</Project> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> + </PropertyGroup> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + </Target> +</Project>
\ No newline at end of file diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters index c7a97272bec..eb750eda368 100644 --- a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters +++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters @@ -24,4 +24,7 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/cpp/test/Common/msbuild/uwp/testcommon.vcxproj b/cpp/test/Common/msbuild/uwp/testcommon.vcxproj index 518310a826f..546dd588b50 100644 --- a/cpp/test/Common/msbuild/uwp/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/uwp/testcommon.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -219,5 +221,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> -</Project> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> +</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj index 8b0b86d5fac..317f6c64e60 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -236,5 +238,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj index 165ed6c835d..5651dc59a83 100644 --- a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj index 23af80ff8e6..b8bd30a99f3 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj index 0bdde42c298..e2f65f474ed 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -240,5 +242,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj index f4756fbe152..9a1fe01e02c 100644 --- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -244,5 +246,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj index 8843591aa68..cf859b94dd5 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -236,5 +238,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj index c29c9cc4a7d..976533e1f5f 100644 --- a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj index cca6a76e504..df8598dfe3d 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj index 95f82900167..087934cb91e 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -238,5 +240,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj index 2001421700e..85890024652 100644 --- a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj index 2d36ff6676e..67ebe38e341 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj index 2a496bbdbac..3f14966145d 100644 --- a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj index af59141cefd..67432c740d7 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -238,5 +240,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj index 8c4eb702db9..7a686094a65 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -240,5 +242,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj index 9aa51287318..a7edf022b97 100644 --- a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -244,5 +246,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj index 9bf0f294a06..aeb5c5f4482 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -236,5 +238,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj index 0eacee2d84a..b6d25a41f94 100644 --- a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj index 1adee5f1b90..4d21f4cf3e3 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -207,5 +209,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj index 1689dd282bb..f38e734d71f 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -239,5 +241,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj index f33f8ee6bba..9f17872d5f5 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -243,5 +245,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj index 7a8b96a7536..b481fd7fed2 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -244,5 +246,5 @@ <IceBuilder Include="..\..\..\TestAMD.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj index 5b3a3da916c..88e36f34ec3 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj index 15b0200f182..3008e3a3c76 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -238,5 +240,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj index e73231d340f..68792bd8b66 100644 --- a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj index ca549d03022..157f2b3af86 100644 --- a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -235,5 +237,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj index 205c585b1b7..79055aa9956 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj index 13323455542..b567d2e2849 100644 --- a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj index fc0d92f217c..c3a855c56ae 100644 --- a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -236,5 +238,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj index 0778682cecd..0e588b27bdf 100644 --- a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj index 98954e8638d..ea7f3009af3 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj index 81a9a2bbe4a..d7fcb95dbcf 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -238,5 +240,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj index afb5e898e90..52eb2978f03 100644 --- a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj index ec6d0e9ec49..cf8e443a4b0 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj index 03ff351e255..d367df003cf 100644 --- a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj index 39b3ec5cfb6..d2c3836d36b 100644 --- a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj index 5409e4787fe..f3f94626117 100644 --- a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -244,5 +246,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj index 2c8df3f28cf..9eb9f600671 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -237,5 +239,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj index 405c180fe17..1880095d0ea 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -239,5 +241,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj index 3f6493290e0..9696ec39902 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj index f3a8f24055d..dccdc7fe97d 100644 --- a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -243,5 +245,5 @@ <IceBuilder Include="..\..\..\TestAMD.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj index d0dbfdf6b35..d20f4b935a7 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -411,5 +413,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj index 208d75503d6..c597f80809f 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -412,5 +414,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj index 2aaabda6f30..94ea87439f3 100644 --- a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -416,5 +418,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj index f53dafc2751..c77f7e79084 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -212,5 +214,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj index b148ec4dfdf..d31de1bbaf2 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -244,5 +246,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj index 287d020b140..2bfba18156d 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj index ed30734d512..827d69306d9 100644 --- a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -255,5 +257,5 @@ <IceBuilder Include="..\..\..\TestAMD.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj index 0e86dc64f77..0ba542bb578 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -206,5 +208,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj index 0bee2732073..cd40605201f 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -238,5 +240,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj index e22588de196..95011d3efda 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj index f29315e3cf3..bd6f1c3c27d 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -243,5 +245,5 @@ <IceBuilder Include="..\..\..\TestAMD.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj index 1d619b00d28..6db3e1271b7 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -239,5 +241,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj index 4ecfbe10890..274643365f0 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -241,5 +243,5 @@ <IceBuilder Include="..\..\..\Test.ice" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj index 9b72e08a1db..92fd8102b0f 100644 --- a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -245,5 +247,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj index cc2da46657a..05840df9458 100644 --- a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj +++ b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -235,5 +237,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj index bc9082665ee..18748da22f1 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -237,5 +239,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj index 9897a480263..2431bbf4d35 100644 --- a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj index 12a70de01d9..508e686322b 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -236,5 +238,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj index 2e1a9cc53bd..63fc7eaa8b2 100644 --- a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj @@ -36,6 +36,8 @@ <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -70,7 +72,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -242,5 +244,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj b/cpp/test/uwp/msbuild/uwp.vcxproj index 6579fc7220e..0682ea6d666 100644 --- a/cpp/test/uwp/msbuild/uwp.vcxproj +++ b/cpp/test/uwp/msbuild/uwp.vcxproj @@ -11,6 +11,8 @@ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> <ApplicationTypeRevision>10.0</ApplicationTypeRevision> <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <ItemGroup Label="ProjectConfigurations"> @@ -74,7 +76,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.testuwp.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -1354,7 +1356,7 @@ </None> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file |