Squashed commit of the following:

commit f25399b006e5b15b46e4258546d80e1d006e1bc1
Author: U-bwin7\bernard <bernard@bwin7.(none)>
Date:   Thu May 13 11:41:01 2010 -0400

    VS2010 port

42 files changed, 373 insertions, 65 deletions

diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 16f47846ad2..8017033c55a 100644..100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -28,7 +28,7 @@ prefix			= C:\Ice-$(VERSION)
 

 #

 # Specify your C++ compiler. Supported values are:

-# VC60, VC90, VC90_EXPRESS, BCC2010

+# VC60, VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, BCC2010

 #

 !if "$(CPP_COMPILER)" == ""

 CPP_COMPILER		= VC90

@@ -95,7 +95,9 @@ SETARGV			= setargv.obj
 !if "$(CPP_COMPILER)" == "BCC2010"

 BCPLUSPLUS		= yes

 !include 	$(top_srcdir)/config/Make.rules.bcc

-!elseif "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" 

+!elseif "$(CPP_COMPILER)" == "VC60" || \

+        "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \

+        "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"

 !include        $(top_srcdir)/config/Make.rules.msvc

 ! else

 !error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)

@@ -106,6 +108,10 @@ libsuff			= \bcc10
 !elseif "$(CPP_COMPILER)" == "VC60"

 libsuff			= \vc6

 UNIQUE_DLL_NAMES	= yes

+!elseif "$(CPP_COMPILER)" == "VC100"

+libsuff			= \vc100$(x64suffix)

+!elseif "$(CPP_COMPILER)" == "VC100_EXPRESS"

+libsuff			= \vc100$(x64suffix)

 !else

 libsuff			= $(x64suffix)

 !endif

@@ -129,6 +135,8 @@ CPPFLAGS        = -I"$(ice_dir)\include\stlport" $(CPPFLAGS)
 COMPSUFFIX	= vc60_

 !elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"

 COMPSUFFIX	= vc90_

+!elseif "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"

+COMPSUFFIX	= vc100_

 !elseif "$(CPP_COMPILER)" == "BCC2010"

 COMPSUFFIX	= bcc10_

 !endif

diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc
index bd661cef04f..bd661cef04f 100644..100755
--- a/cpp/config/Make.rules.msvc
+++ b/cpp/config/Make.rules.msvc
diff --git a/cpp/demo/Ice/MFC/client/Makefile.mak b/cpp/demo/Ice/MFC/client/Makefile.mak
index 5090e853930..5090e853930 100644..100755
--- a/cpp/demo/Ice/MFC/client/Makefile.mak
+++ b/cpp/demo/Ice/MFC/client/Makefile.mak
diff --git a/cpp/demo/Ice/MFC/client/stdafx.cpp b/cpp/demo/Ice/MFC/client/stdafx.cpp
index 1e840966688..1e840966688 100644..100755
--- a/cpp/demo/Ice/MFC/client/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/client/stdafx.cpp
diff --git a/cpp/demo/Ice/MFC/client/stdafx.h b/cpp/demo/Ice/MFC/client/stdafx.h
index 1112d4eaa13..7126aebe7ef 100644..100755
--- a/cpp/demo/Ice/MFC/client/stdafx.h
+++ b/cpp/demo/Ice/MFC/client/stdafx.h
@@ -33,13 +33,19 @@
 #endif
 
 #ifndef WINVER
-#  if defined(_MSC_VER) && _MSC_VER > 1300
+#  if defined(_MSC_VER) && _MSC_VER > 1300 && _MSC_VER < 1600
 #    define WINVER 0x0400
+#  elif defined(_MSC_VER) && _MSC_VER >=1600
+ #   define WINVER 0x0501
 #  endif
 #endif
 
 #ifndef _WIN32_IE                       // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400        // Change this to the appropriate value to target IE 5.0 or later.
+#   if defined(_MSC_VER) && _MSC_VER >=1600
+#      define _WIN32_IE 0x0500        // Change this to the appropriate value to target IE 5.0 or later.
+#   else
+#      define _WIN32_IE 0x0400        
+#   endif
 #endif
 
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // some CString constructors will be explicit
diff --git a/cpp/demo/Ice/MFC/server/stdafx.h b/cpp/demo/Ice/MFC/server/stdafx.h
index 1112d4eaa13..7126aebe7ef 100644..100755
--- a/cpp/demo/Ice/MFC/server/stdafx.h
+++ b/cpp/demo/Ice/MFC/server/stdafx.h
@@ -33,13 +33,19 @@
 #endif
 
 #ifndef WINVER
-#  if defined(_MSC_VER) && _MSC_VER > 1300
+#  if defined(_MSC_VER) && _MSC_VER > 1300 && _MSC_VER < 1600
 #    define WINVER 0x0400
+#  elif defined(_MSC_VER) && _MSC_VER >=1600
+ #   define WINVER 0x0501
 #  endif
 #endif
 
 #ifndef _WIN32_IE                       // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400        // Change this to the appropriate value to target IE 5.0 or later.
+#   if defined(_MSC_VER) && _MSC_VER >=1600
+#      define _WIN32_IE 0x0500        // Change this to the appropriate value to target IE 5.0 or later.
+#   else
+#      define _WIN32_IE 0x0400        
+#   endif
 #endif
 
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // some CString constructors will be explicit
diff --git a/cpp/demo/IcePatch2/MFC/stdafx.h b/cpp/demo/IcePatch2/MFC/stdafx.h
index 1112d4eaa13..7126aebe7ef 100644..100755
--- a/cpp/demo/IcePatch2/MFC/stdafx.h
+++ b/cpp/demo/IcePatch2/MFC/stdafx.h
@@ -33,13 +33,19 @@
 #endif
 
 #ifndef WINVER
-#  if defined(_MSC_VER) && _MSC_VER > 1300
+#  if defined(_MSC_VER) && _MSC_VER > 1300 && _MSC_VER < 1600
 #    define WINVER 0x0400
+#  elif defined(_MSC_VER) && _MSC_VER >=1600
+ #   define WINVER 0x0501
 #  endif
 #endif
 
 #ifndef _WIN32_IE                       // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400        // Change this to the appropriate value to target IE 5.0 or later.
+#   if defined(_MSC_VER) && _MSC_VER >=1600
+#      define _WIN32_IE 0x0500        // Change this to the appropriate value to target IE 5.0 or later.
+#   else
+#      define _WIN32_IE 0x0400        
+#   endif
 #endif
 
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // some CString constructors will be explicit
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index f72665ca556..6ceaa52380a 100644..100755
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -236,6 +236,9 @@ protected:
 #if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300))
             std::pair<StoreMap::iterator, bool> ir = 
                 _storeMap.insert(StoreMap::value_type(facet, 0));
+#elif (defined(_MSC_VER) && (_MSC_VER >= 1600))
+	    std::pair<typename StoreMap::iterator, bool> ir = 
+                _storeMap.insert(typename StoreMap::value_type(facet, nullptr));
 #else
             std::pair<typename StoreMap::iterator, bool> ir = 
                 _storeMap.insert(typename StoreMap::value_type(facet, 0));
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index 0a99da28a25..f5ab1653de3 100644..100755
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -439,7 +439,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
         while(true)
         {
             in.read(buff, 1024);
-            descriptors.append(buff, in.gcount());
+            descriptors.append(buff, static_cast<size_t>(in.gcount()));
             if(in.gcount() < 1024)
             {
                 break;
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
index e0ba143e66b..ad47f9ca2a8 100644..100755
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ b/cpp/src/FreezeScript/TransformVisitor.cpp
@@ -527,7 +527,12 @@ FreezeScript::TransformVisitor::transformObject(const ObjectDataPtr& dest, const
     catch(...)
     {
         objectDataMap.erase(p);
+
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+	objectDataMap.insert(ObjectDataMap::value_type(src.get(), nullptr));
+#else
         objectDataMap.insert(ObjectDataMap::value_type(src.get(), 0));
+#endif
         throw;
     }
 }
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index adb1601c5de..b509c1a0045 100644..100755
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -2649,7 +2649,11 @@ FreezeScript::ObjectVisitor::visitObject(const ObjectRefPtr& data)
         ObjectDataMap::iterator p = _map.find(value.get());
         if(p == _map.end())
         {
-            _map.insert(ObjectDataMap::value_type(value.get(), 0));
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+            _map.insert(ObjectDataMap::value_type(value.get(), nullptr));
+#else
+	    _map.insert(ObjectDataMap::value_type(value.get(), 0));
+#endif
             DataMemberMap& members = value->getMembers();
             for(DataMemberMap::iterator q = members.begin(); q != members.end(); ++q)
             {
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 1e9dc8e5eea..9d5afb3f8b9 100644..100755
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -686,7 +686,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
         while(true)
         {
             in.read(buff, 1024);
-            descriptors.append(buff, in.gcount());
+            descriptors.append(buff, static_cast<size_t>(in.gcount()));
             if(in.gcount() < 1024)
             {
                 break;
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index b9531f5daf2..43270817851 100644..100755
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -99,7 +99,11 @@ public:
     virtual void
     ice_sent()
     {
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+        _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
         _amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
     }
 
     virtual void
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index bdbd08993bc..6fcc25f8d71 100644..100755
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -346,7 +346,7 @@ public:
         {
             return false;
         }
-        pos += istr.tellg();
+        pos += static_cast<string::size_type>(istr.tellg());
         {
             for(vector<int>::const_iterator i = _values.begin(); i != _values.end(); ++i)
             {
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index 185ad783209..a901b6208a1 100644..100755
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -102,7 +102,11 @@ public:
     virtual void
     ice_sent()
     {
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+        _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
         _amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
     }
 };
 
@@ -123,7 +127,11 @@ Glacier2::Request::Request(const ObjectPrx& proxy, const std::pair<const Byte*,
     //
     if(_proxy->ice_isBatchOneway() || _proxy->ice_isBatchDatagram())
     {
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+        _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
         _amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
     }
 
     Context::const_iterator p = current.ctx.find("_ovrd");
@@ -216,7 +224,11 @@ Glacier2::Request::invoke(const InstancePtr& instance, const Ice::ConnectionPtr&
         }
         if(sent && !_proxy->ice_isTwoway())
         {
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+            _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr));
+#else
             _amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0));
+#endif
         }
         return false; // Not a batch invocation.
     }
diff --git a/cpp/src/Ice/Base64.cpp b/cpp/src/Ice/Base64.cpp
index fa8bae38773..12ebd4929ca 100644..100755
--- a/cpp/src/Ice/Base64.cpp
+++ b/cpp/src/Ice/Base64.cpp
@@ -8,9 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Base64.h>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 using namespace std;
 
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 3e94e6569d4..217069d06c2 100644..100755
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -24,9 +24,7 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/StringConverter.h>
 #include <IceUtil/Unicode.h>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 using namespace std;
 using namespace Ice;
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 1c95fb35c5a..015818d7ce0 100644..100755
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -25,9 +25,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/Functional.h>
 #include <IceUtil/Random.h>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 using namespace std;
 using namespace Ice;
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index cafb2493f59..29e6cfb0ee8 100644..100755
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -11,6 +11,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/ObjectAdapter.h>
 #include <IceGrid/SessionServantManager.h>
+#include <iterator>
 
 using namespace std;
 using namespace IceGrid;
diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h
index 1da82ced159..a0e0404248d 100644..100755
--- a/cpp/src/IceGrid/Util.h
+++ b/cpp/src/IceGrid/Util.h
@@ -14,11 +14,8 @@
 #include <IceUtil/StringUtil.h>
 #include <IceGrid/Exception.h>
 #include <IceUtil/Random.h>
-
 #include <functional>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 namespace IceGrid
 {
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index fe99e7dda3b..5151ae9d133 100644..100755
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -12,6 +12,7 @@
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
 #include <IcePatch2/Util.h>
+#include <iterator>
 
 using namespace std;
 using namespace Ice;
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index 62bfa08ac68..cee2e9fe934 100644..100755
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -84,7 +84,12 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp
         return;
     }
 
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+    pair<const Byte*, const Byte*> ret(nullptr, nullptr);
+#else
     pair<const Byte*, const Byte*> ret(0, 0);
+#endif
+    
     if(num <= 0 || pos < 0)
     {   
         cb->ice_response(ret);
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak
index 865ecabc478..8fa47dc6fd1 100644..100755
--- a/cpp/src/IcePatch2/Makefile.mak
+++ b/cpp/src/IcePatch2/Makefile.mak
@@ -30,6 +30,12 @@ SRCS		= $(SOBJS:.obj=.cpp) \
 

 CPPFLAGS	= -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

 

+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \

+    "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"

+LD_EXEFLAGS  = /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" $(LD_EXEFLAGS)

+!endif

+

+

 !if "$(GENERATE_PDB)" == "yes"

 SPDBFLAGS       = /pdb:$(SERVER:.exe=.pdb)

 CPDBFLAGS       = /pdb:$(CLIENT:.exe=.pdb)

@@ -44,19 +50,19 @@ $(SERVER): $(SOBJS) IcePatch2Server.res
 	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \

 		icepatch2$(LIBSUFFIX).lib $(SRES_FILE)

 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

-	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

 $(CLIENT): $(COBJS) IcePatch2Client.res

 	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \

 		icepatch2$(LIBSUFFIX).lib $(CRES_FILE)

 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

-	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

 $(CALC): $(CALCOBJS) IcePatch2Calc.res

 	$(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(SETARGV) $(CALCOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) \

 		icepatch2$(LIBSUFFIX).lib $(CARES_FILE)

 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

-	    $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

 clean::

 	-del /q $(SERVER:.exe=.*)

diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 70c641860e8..8bba1cc3784 100644..100755
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -16,10 +16,7 @@
 #include <IcePatch2/Util.h>
 #include <IcePatch2/FileServerI.h>
 #include <list>
-
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 using namespace std;
 using namespace Ice;
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 9eaa712190b..d6bd48e1bd1 100644..100755
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -32,9 +32,7 @@
 #   include <dirent.h>
 #endif
 
-#ifdef __BCPLUSPLUS__
-#   include <iterator>
-#endif
+#include <iterator>
 
 const char* IcePatch2::checksumFile = "IcePatch2.sum";
 const char* IcePatch2::logFile = "IcePatch2.log";
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index a7563d9cc08..6ce6be549ce 100644..100755
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -11,8 +11,8 @@
 #include <IceStorm/Instance.h>
 #include <IceStorm/TraceLevels.h>
 #include <IceStorm/NodeI.h>
-
 #include <Ice/LoggerUtil.h>
+#include <iterator>
 
 using namespace std;
 using namespace IceStorm;
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index f926ca4de80..70bfd33d573 100644..100755
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -15,9 +15,7 @@
 #include <Slice/GrammarUtil.h>
 #include <Slice/Util.h>
 #include <cstring>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 #ifdef _WIN32
 #   include <io.h>
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index e00e869c3a5..8a9d96da270 100644..100755
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -14,9 +14,7 @@
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/InputUtil.h>
 #include <climits>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 using namespace std;
 using namespace Slice;
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index ea516807ca2..ada72fe1ce3 100644..100755
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -12,10 +12,7 @@
 #include <Slice/Util.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/InputUtil.h>
-
-#ifdef __BCPLUSPLUS__
 #include <iterator>
-#endif
 
 using namespace std;
 using namespace Slice;
diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak
index 71fca32fef5..94fe0dc39aa 100644..100755
--- a/cpp/src/iceserviceinstall/Makefile.mak
+++ b/cpp/src/iceserviceinstall/Makefile.mak
@@ -23,8 +23,9 @@ SRCS		= $(OBJS:.obj=.cpp)
 CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

 

 LINKWITH        = $(LIBS)

-!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"

-LINKWITH	= /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)

+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \

+    "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"

+LINKWITH	= /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH)

 !else

 EXTRA_MANIFEST  = security.manifest

 !endif

diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 3341b03fe89..2504a2597cd 100644..100755
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -16,6 +16,7 @@
 #include <Slice/FileTracker.h>
 #include <Slice/JavaUtil.h>
 #include <Slice/Util.h>
+#include <iterator>
 
 using namespace std;
 using namespace Slice;
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 3c51d5d716e..ab26b6b4e4b 100644..100755
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -26,9 +26,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 #include <string.h>
 
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index f281be68a6c..f281be68a6c 100644..100755
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 90c0af9169f..be133161324 100644..100755
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -15,6 +15,7 @@
 #include <Slice/FileTracker.h>
 #include <Slice/Util.h>
 #include <Gen.h>
+#include <iterator>
 
 using namespace std;
 using namespace Slice;
diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp
index a3b51ada7ca..7e64ee26f18 100644..100755
--- a/cpp/test/Ice/invoke/BlobjectI.cpp
+++ b/cpp/test/Ice/invoke/BlobjectI.cpp
@@ -103,7 +103,11 @@ BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb,
     Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inParams);
     vector<Ice::Byte> outParams;
     bool ok = invokeInternal(in, outParams, current);
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+    pair<const Ice::Byte*, const Ice::Byte*> outPair(nullptr, nullptr);
+#else
     pair<const Ice::Byte*, const Ice::Byte*> outPair(0, 0);
+#endif
     if(outParams.size() != 0)
     {
         outPair.first = &outParams[0];
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index be256a3f5cd..c80eb21c2ad 100644..100755
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.cpp
@@ -11,9 +11,7 @@
 #include <TestAMDI.h>
 #include <TestCommon.h>
 #include <functional>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 class Thread_opVoid : public IceUtil::Thread
 {
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index b9020f03d87..a1ac44a2b1b 100644..100755
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -12,9 +12,7 @@
 #include <TestI.h>
 #include <TestCommon.h>
 #include <functional>
-#ifdef __BCPLUSPLUS__
-#  include <iterator>
-#endif
+#include <iterator>
 
 void
 MyDerivedClassI::shutdown(const Ice::Current& current)
diff --git a/cs/src/Glacier2/Makefile.mak b/cs/src/Glacier2/Makefile.mak
index 21a1b6abfff..0d28adbb7d4 100644..100755
--- a/cs/src/Glacier2/Makefile.mak
+++ b/cs/src/Glacier2/Makefile.mak
@@ -32,7 +32,9 @@ GDIR		= generated
 

 MCSFLAGS	= $(MCSFLAGS) -target:library -out:$(TARGETS) -warnaserror-

 MCSFLAGS	= $(MCSFLAGS) -keyfile:$(KEYFILE)

-MCSFLAGS	= $(MCSFLAGS) /doc:$(bindir)\$(PKG).xml /nowarn:1591 -r:WindowsBase.dll

+MCSFLAGS	= $(MCSFLAGS) /doc:$(bindir)\$(PKG).xml /nowarn:1591

+

+# -r:WindowsBase.dll

 

 SLICE2CSFLAGS	= $(SLICE2CSFLAGS) -I$(slicedir)

 

diff --git a/vsplugin/config/Make.rules.mak b/vsplugin/config/Make.rules.mak
index 10537b9dde9..503187be988 100644..100755
--- a/vsplugin/config/Make.rules.mak
+++ b/vsplugin/config/Make.rules.mak
@@ -35,6 +35,7 @@ OPTIMIZE		= yes
 KEYFILE			= $(top_srcdir)\config\IceDevKey.snk

 !endif

 

+

 # ----------------------------------------------------------------------

 # Don't change anything below this line!

 # ----------------------------------------------------------------------

@@ -52,9 +53,22 @@ ice_language = cs
 

 EVERYTHING      = all install clean

 

-VS_HOME 		= $(VSINSTALLDIR)

+#

+# Visual Studio version

+#

+

+!if "$(VSSDK100INSTALL)" != ""

+VSTARGET                = VS2010

+VSSDK_HOME              = $(VSSDK100INSTALL)

+!elseif "$(VSSDK90INSTALL)" != ""

+VSTARGET                = VS2008

 VSSDK_HOME		= $(VSSDK90INSTALL)

-PKG_PREFIX 		= VS2008

+!else

+!error Neither VSSDK100INSTALL not VSSDK90INSTALL is set

+!endif

+

+VS_HOME 		= $(VSINSTALLDIR)

+PKG_PREFIX 		= $(VSTARGET)

 

 bindir 			= ..\bin

 

@@ -80,21 +94,44 @@ MCSFLAGS 		= $(MCSFLAGS) -debug -define:DEBUG
 MCSFLAGS 		= $(MCSFLAGS) -optimize+

 !endif

 

+#

+# TODO: is this really necessary?

+#

+!if "$(VSTARGET)" == "VS2008"

 MCSFLAGS = $(MCSFLAGS) -define:VS2008

+!endif

+

 

-MCSFLAGS = $(MCSFLAGS) /reference:"C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll"

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE.dll"

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE80.dll"

-MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Visual Studio Tools for Office\PIA\Office11\Extensibility.dll"

+

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.CommandBars.dll"

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\VSLangProj.dll"

 

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll"

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll"

 

+

+!if "$(VSTARGET)" == "VS2008"

+

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Visual Studio Tools for Office\PIA\Office11\Extensibility.dll"

+

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.OLE.Interop.dll"

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.dll"

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.dll"

 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.8.0.dll"

 

+!endif

+

+!if "$(VSTARGET)" == "VS2010"

+

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Visual Studio Tools for Office\PIA\Common\Extensibility.dll"

+

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.OLE.Interop.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.dll"

+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.8.0.dll"

+

+!endif

+

 all::

diff --git a/vsplugin/src/Builder.cs b/vsplugin/src/Builder.cs
index a6c5b211539..1df9ff00e1e 100644
--- a/vsplugin/src/Builder.cs
+++ b/vsplugin/src/Builder.cs
@@ -18,7 +18,6 @@ using EnvDTE80;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.CommandBars;
 using Microsoft.VisualStudio.VCProjectEngine;
-using Microsoft.VisualStudio.VCProject;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using System.Resources;
diff --git a/vsplugin/src/Connect.cs b/vsplugin/src/Connect.cs
index 38475ea16a1..148dcbd0604 100644
--- a/vsplugin/src/Connect.cs
+++ b/vsplugin/src/Connect.cs
@@ -52,11 +52,18 @@ namespace Ice.VisualStudio
                 {
 
                     //
-                    // This property is set to false to avoid VC++ "not maching rule" dialog
+                    // This property is set to false to avoid VC++ "no matching rule" dialog
                     //
                     EnvDTE.Properties props = _applicationObject.get_Properties("Projects", "VCGeneral");
-                    EnvDTE.Property prop = props.Item("ShowNoMatchingRuleDlg");
-                    prop.Value = false;
+                    try
+                    {
+                        EnvDTE.Property prop = props.Item("ShowNoMatchingRuleDlg");
+                        prop.Value = false;
+                    }
+                    catch (System.ArgumentException)
+                    {
+                        // ignored: this property does not exist with Visual Studio 2010
+                    }
 
                     _builder = new Builder();
                     _builder.init(_applicationObject, _addInInstance);
diff --git a/vsplugin/src/addin-vs2010.csproj b/vsplugin/src/addin-vs2010.csproj
new file mode 100755
index 00000000000..17e992bf340
--- /dev/null
+++ b/vsplugin/src/addin-vs2010.csproj
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <StartupObject>

+    </StartupObject>

+    <NoStandardLibraries>false</NoStandardLibraries>

+    <AssemblyName>IceVisualStudioAddin-VS2010</AssemblyName>

+    <RootNamespace>Ice.VisualStudio</RootNamespace>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <SignAssembly>false</SignAssembly>

+    <AssemblyOriginatorKeyFile>

+    </AssemblyOriginatorKeyFile>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>3.5</OldToolsVersion>

+    <UpgradeBackupLocation />

+    <PublishUrl>publish\</PublishUrl>

+    <Install>true</Install>

+    <InstallFrom>Disk</InstallFrom>

+    <UpdateEnabled>false</UpdateEnabled>

+    <UpdateMode>Foreground</UpdateMode>

+    <UpdateInterval>7</UpdateInterval>

+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>

+    <UpdatePeriodically>false</UpdatePeriodically>

+    <UpdateRequired>false</UpdateRequired>

+    <MapFileExtensions>true</MapFileExtensions>

+    <ApplicationRevision>0</ApplicationRevision>

+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

+    <IsWebBootstrapper>false</IsWebBootstrapper>

+    <UseApplicationTrust>false</UseApplicationTrust>

+    <BootstrapperEnabled>true</BootstrapperEnabled>

+    <TargetFrameworkProfile />

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <Optimize>false</Optimize>

+    <OutputPath>..\bin\</OutputPath>

+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

+    <DefineConstants>TRACE;DEBUG;VS2008</DefineConstants>

+    <WarningLevel>4</WarningLevel>

+    <IncrementalBuild>false</IncrementalBuild>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugSymbols>false</DebugSymbols>

+    <Optimize>true</Optimize>

+    <OutputPath>..\bin\</OutputPath>

+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>

+    <DefineConstants>TRACE</DefineConstants>

+    <WarningLevel>4</WarningLevel>

+    <IncrementalBuild>false</IncrementalBuild>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

+    <DebugSymbols>true</DebugSymbols>

+    <OutputPath>bin\x86\Debug\</OutputPath>

+    <DefineConstants>TRACE;DEBUG;VS2008</DefineConstants>

+    <PlatformTarget>x86</PlatformTarget>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

+    <OutputPath>bin\x86\Release\</OutputPath>

+    <DefineConstants>TRACE;VS2008</DefineConstants>

+    <Optimize>true</Optimize>

+    <PlatformTarget>x86</PlatformTarget>

+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

+  </PropertyGroup>

+  <PropertyGroup>

+    <ApplicationIcon>

+    </ApplicationIcon>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+    <Reference Include="Microsoft.CSharp" />

+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+    <Reference Include="Microsoft.VisualStudio.Shell, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+    <Reference Include="Microsoft.VisualStudio.VCProject, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+      <SpecificVersion>False</SpecificVersion>

+      <EmbedInteropTypes>False</EmbedInteropTypes>

+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+      <SpecificVersion>False</SpecificVersion>

+      <EmbedInteropTypes>True</EmbedInteropTypes>

+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.Vsa" />

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Drawing" />

+    <Reference Include="System.Windows.Forms" />

+    <Reference Include="System.Xml" />

+    <Reference Include="System.Xml.Linq">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="AssemblyInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Builder.cs" />

+    <Compile Include="Connect.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="IceVBConfigurationDialog.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="IceVBConfigurationDialog.Designer.cs">

+      <DependentUpon>IceVBConfigurationDialog.cs</DependentUpon>

+    </Compile>

+    <Compile Include="FileTracker.cs" />

+    <Compile Include="IceCppConfigurationDialog.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="IceCppConfigurationDialog.designer.cs">

+      <DependentUpon>IceCppConfigurationDialog.cs</DependentUpon>

+    </Compile>

+    <Compile Include="IceCsharpConfigurationDialog.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="IceCsharpConfigurationDialog.Designer.cs">

+      <DependentUpon>IceCsharpConfigurationDialog.cs</DependentUpon>

+    </Compile>

+    <Compile Include="IceSilverlightConfigurationDialog.cs">

+      <SubType>Form</SubType>

+    </Compile>

+    <Compile Include="IceSilverlightConfigurationDialog.designer.cs">

+      <DependentUpon>IceSilverlightConfigurationDialog.cs</DependentUpon>

+    </Compile>

+    <Compile Include="Util.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <COMReference Include="EnvDTE">

+      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>

+      <VersionMajor>8</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>primary</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+    <COMReference Include="EnvDTE80">

+      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>

+      <VersionMajor>8</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>primary</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+    <COMReference Include="Microsoft.VisualStudio.CommandBars">

+      <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>

+      <VersionMajor>8</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>primary</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+    <COMReference Include="stdole">

+      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>

+      <VersionMajor>2</VersionMajor>

+      <VersionMinor>0</VersionMinor>

+      <Lcid>0</Lcid>

+      <WrapperTool>primary</WrapperTool>

+      <Isolated>False</Isolated>

+    </COMReference>

+  </ItemGroup>

+  <ItemGroup>

+    <EmbeddedResource Include="IceVBConfigurationDialog.resx">

+      <DependentUpon>IceVBConfigurationDialog.cs</DependentUpon>

+    </EmbeddedResource>

+    <EmbeddedResource Include="IceCppConfigurationDialog.resx">

+      <DependentUpon>IceCppConfigurationDialog.cs</DependentUpon>

+    </EmbeddedResource>

+    <EmbeddedResource Include="IceCsharpConfigurationDialog.resx">

+      <DependentUpon>IceCsharpConfigurationDialog.cs</DependentUpon>

+    </EmbeddedResource>

+    <EmbeddedResource Include="IceSilverlightConfigurationDialog.resx">

+      <DependentUpon>IceSilverlightConfigurationDialog.cs</DependentUpon>

+    </EmbeddedResource>

+  </ItemGroup>

+  <ItemGroup>

+    <WCFMetadata Include="Service References\" />

+  </ItemGroup>

+  <ItemGroup>

+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>

+      <Install>false</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

+      <Visible>False</Visible>

+      <ProductName>.NET Framework 3.5 SP1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">

+      <Visible>False</Visible>

+      <ProductName>Windows Installer 3.1</ProductName>

+      <Install>true</Install>

+    </BootstrapperPackage>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>
\ No newline at end of file