summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-04-20 08:12:37 +0200
committerJose <jose@zeroc.com>2017-04-20 08:12:37 +0200
commitcc82669355e32cc855a48fb4211e56a2abaf51d0 (patch)
tree6d33b343cc05fac3c38bd4145ad8b12586578b59 /cpp/src
parentFix UWP package names in build instructions (diff)
downloadice-cc82669355e32cc855a48fb4211e56a2abaf51d0.tar.bz2
ice-cc82669355e32cc855a48fb4211e56a2abaf51d0.tar.xz
ice-cc82669355e32cc855a48fb4211e56a2abaf51d0.zip
Visual Studio 2010 support
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj3
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp4
-rw-r--r--cpp/src/Ice/Proxy.cpp4
-rw-r--r--cpp/src/Ice/msbuild/ice/ice.vcxproj5
-rw-r--r--cpp/src/Ice/msbuild/ice/packages.config1
-rw-r--r--cpp/src/IceBox/msbuild/icebox/icebox.vcxproj3
-rw-r--r--cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj3
-rw-r--r--cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj3
-rw-r--r--cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj3
-rw-r--r--cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj3
-rw-r--r--cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj3
-rw-r--r--cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj5
-rw-r--r--cpp/src/IcePatch2Lib/msbuild/packages.config1
-rw-r--r--cpp/src/IceSSL/SChannelEngine.cpp2
-rw-r--r--cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj3
-rw-r--r--cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj3
-rw-r--r--cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj9
-rw-r--r--cpp/src/Slice/msbuild/slice.vcxproj3
-rw-r--r--cpp/src/slice2cpp/msbuild/packages.config1
-rw-r--r--cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj5
-rw-r--r--cpp/src/slice2cs/msbuild/packages.config1
-rw-r--r--cpp/src/slice2cs/msbuild/slice2cs.vcxproj5
-rw-r--r--cpp/src/slice2html/msbuild/packages.config1
-rw-r--r--cpp/src/slice2html/msbuild/slice2html.vcxproj5
-rw-r--r--cpp/src/slice2java/msbuild/packages.config1
-rw-r--r--cpp/src/slice2java/msbuild/slice2java.vcxproj5
-rw-r--r--cpp/src/slice2js/msbuild/packages.config1
-rw-r--r--cpp/src/slice2js/msbuild/slice2js.vcxproj5
-rw-r--r--cpp/src/slice2objc/msbuild/packages.config1
-rw-r--r--cpp/src/slice2objc/msbuild/slice2objc.vcxproj5
-rw-r--r--cpp/src/slice2php/msbuild/packages.config1
-rw-r--r--cpp/src/slice2php/msbuild/slice2php.vcxproj5
-rw-r--r--cpp/src/slice2py/msbuild/packages.config1
-rw-r--r--cpp/src/slice2py/msbuild/slice2py.vcxproj5
-rw-r--r--cpp/src/slice2rb/msbuild/packages.config1
-rw-r--r--cpp/src/slice2rb/msbuild/slice2rb.vcxproj5
36 files changed, 108 insertions, 7 deletions
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
index 83de952e24f..ba21dbf8cbf 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 9f5106316d1..209092b5c4b 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -904,9 +904,9 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
_os.write(static_cast<Byte>(_mode));
-#if defined(_MSC_VER) && (_MSC_VER == 1500)
+#if defined(_MSC_VER) && (_MSC_VER <= 1600)
//
- // COMPILERFIX VC90 get confused with namespaces and we need to
+ // COMPILERFIX VC90 and VC100 get confused with namespaces and we need to
// defined both Ice::noExplicitContext and IceProxy::Ice::noExplicitContext
// see comments in Ice/Proxy.h.
//
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 65fc7a6dd25..b46545c35c1 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -36,9 +36,9 @@ const Context noExplicitContext;
}
-#if defined(_MSC_VER) && (_MSC_VER == 1500)
+#if defined(_MSC_VER) && (_MSC_VER <= 1600)
//
-// COMPILERFIX VC90 get confused with namespaces and complains that
+// COMPILERFIX VC90 and VC100 get confused with namespaces and complains that
// ::Ice::noExplicitContext isn't defined in IceProxy namespace.
//
namespace IceProxy
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
index 8e0e06fb697..1e7db1337f7 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -1772,6 +1775,7 @@
<Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets')" />
<Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets')" />
<Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -1780,6 +1784,7 @@
<Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets'))" />
<Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets'))" />
<Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
diff --git a/cpp/src/Ice/msbuild/ice/packages.config b/cpp/src/Ice/msbuild/ice/packages.config
index 5b9a7cf017c..76b5be873f3 100644
--- a/cpp/src/Ice/msbuild/ice/packages.config
+++ b/cpp/src/Ice/msbuild/ice/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="bzip2.v100" version="1.0.6.6" targetFramework="native" />
<package id="bzip2.v120" version="1.0.6.6" targetFramework="native" />
<package id="bzip2.v140" version="1.0.6.6" targetFramework="native" />
<package id="bzip2.v141" version="1.0.6.6" targetFramework="native" />
diff --git a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
index c803e15529b..2508280c326 100644
--- a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
+++ b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>IceBox</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
index 78e782c9c89..20ec5c750f2 100644
--- a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
+++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>IceBox</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
index 1c0e7fe669f..0f2f69566fb 100644
--- a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
+++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
index ab49b05fd12..257d535de18 100644
--- a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
+++ b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
index f4192cf5a43..633d97e7b9c 100644
--- a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
+++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
index 2e5a8e116ce..9f6594c7a12 100644
--- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
index 644bfd609fe..cba2fdaf6e6 100644
--- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
+++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -199,6 +202,7 @@
<Import Project="..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -207,6 +211,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v120.1.0.6.6\build\native\bzip2.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v140.1.0.6.6\build\native\bzip2.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v141.1.0.6.6\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v100.1.0.6.6\build\native\bzip2.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
diff --git a/cpp/src/IcePatch2Lib/msbuild/packages.config b/cpp/src/IcePatch2Lib/msbuild/packages.config
index 5b9a7cf017c..76b5be873f3 100644
--- a/cpp/src/IcePatch2Lib/msbuild/packages.config
+++ b/cpp/src/IcePatch2Lib/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="bzip2.v100" version="1.0.6.6" targetFramework="native" />
<package id="bzip2.v120" version="1.0.6.6" targetFramework="native" />
<package id="bzip2.v140" version="1.0.6.6" targetFramework="native" />
<package id="bzip2.v141" version="1.0.6.6" targetFramework="native" />
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index e9ca7472b97..a5e0a7c246b 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -35,7 +35,7 @@ const int ICESSL_CALG_ECDH_EPHEM = 0x0000AE06;
//
// COMPILERFIX SCH_USE_STRONG_CRYPTO not defined with VC90
//
-#if defined(_MSC_VER) && (_MSC_VER == 1500)
+#if defined(_MSC_VER) && (_MSC_VER <= 1600)
# ifndef SCH_USE_STRONG_CRYPTO
# define SCH_USE_STRONG_CRYPTO 0x00400000
# endif
diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
index 6af52d8d03a..0316e5ccd69 100644
--- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
index 7c1ee147382..f54b69a65c4 100644
--- a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
+++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
@@ -26,6 +26,9 @@
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
index 3ec98925a9b..007dd37f733 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">
@@ -23,6 +23,9 @@
<RootNamespace>IceUtil</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -87,12 +90,14 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\ConsoleUtil.cpp" />
+ <ClCompile Include="..\..\ConvertUTF.cpp" />
<ClCompile Include="..\..\CtrlCHandler.cpp" />
<ClCompile Include="..\..\OutputUtil.cpp" />
<ClCompile Include="..\..\RecMutex.cpp" />
<ClCompile Include="..\..\StringConverter.cpp" />
<ClCompile Include="..\..\ThreadException.cpp" />
<ClCompile Include="..\..\Time.cpp" />
+ <ClCompile Include="..\..\Unicode.cpp" />
<ClCompile Include="..\..\UtilException.cpp" />
<ClCompile Include="..\..\FileUtil.cpp" />
<ClCompile Include="..\..\InputUtil.cpp" />
@@ -147,4 +152,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj
index b3fd8ebf081..10433737a6d 100644
--- a/cpp/src/Slice/msbuild/slice.vcxproj
+++ b/cpp/src/Slice/msbuild/slice.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>Slice</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2cpp/msbuild/packages.config
+++ b/cpp/src/slice2cpp/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
index b23a5973eb6..30045ff7076 100644
--- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
+++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>slice2cpp</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -124,6 +127,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -132,6 +136,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2cs/msbuild/packages.config b/cpp/src/slice2cs/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2cs/msbuild/packages.config
+++ b/cpp/src/slice2cs/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
index db4e8434402..d9add7e6f5c 100644
--- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
+++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>slice2cs</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -132,6 +135,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -140,6 +144,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2html/msbuild/packages.config b/cpp/src/slice2html/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2html/msbuild/packages.config
+++ b/cpp/src/slice2html/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj b/cpp/src/slice2html/msbuild/slice2html.vcxproj
index 7e40dfff2e8..03ef3897650 100644
--- a/cpp/src/slice2html/msbuild/slice2html.vcxproj
+++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>slice2html</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -128,6 +131,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -136,6 +140,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2java/msbuild/packages.config b/cpp/src/slice2java/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2java/msbuild/packages.config
+++ b/cpp/src/slice2java/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj
index 5f5609bd59e..14ad6b0b925 100644
--- a/cpp/src/slice2java/msbuild/slice2java.vcxproj
+++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>slice2java</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -129,6 +132,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -137,6 +141,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2js/msbuild/packages.config b/cpp/src/slice2js/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2js/msbuild/packages.config
+++ b/cpp/src/slice2js/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj
index d70e6695036..11535c7d702 100644
--- a/cpp/src/slice2js/msbuild/slice2js.vcxproj
+++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj
@@ -22,6 +22,9 @@
<ProjectGuid>{8DF85304-2A53-4C36-804F-5C6FA2F75ACF}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -129,6 +132,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -137,6 +141,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2objc/msbuild/packages.config b/cpp/src/slice2objc/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2objc/msbuild/packages.config
+++ b/cpp/src/slice2objc/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
index 302d9d35112..433c0e1d713 100644
--- a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
+++ b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
@@ -22,6 +22,9 @@
<ProjectGuid>{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -129,6 +132,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -137,6 +141,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2php/msbuild/packages.config b/cpp/src/slice2php/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2php/msbuild/packages.config
+++ b/cpp/src/slice2php/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj
index 93145bb3508..939fa9bb877 100644
--- a/cpp/src/slice2php/msbuild/slice2php.vcxproj
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>slice2php</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -120,6 +123,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -128,6 +132,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2py/msbuild/packages.config b/cpp/src/slice2py/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2py/msbuild/packages.config
+++ b/cpp/src/slice2py/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj
index 34325b1e5a3..0cafd15819f 100644
--- a/cpp/src/slice2py/msbuild/slice2py.vcxproj
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -23,6 +23,9 @@
<RootNamespace>slice2py</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -120,6 +123,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -128,6 +132,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2rb/msbuild/packages.config b/cpp/src/slice2rb/msbuild/packages.config
index 3843006e3cd..06d81257299 100644
--- a/cpp/src/slice2rb/msbuild/packages.config
+++ b/cpp/src/slice2rb/msbuild/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" />
<package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
<package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
index c96710b7df8..f46016c0310 100644
--- a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
+++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
@@ -22,6 +22,9 @@
<ProjectGuid>{A79E9EB0-878C-4EDB-9804-2D262D6008DB}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup>
+ <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -119,6 +122,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -127,6 +131,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:35:17 +0000