summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore6
-rw-r--r--cpp/src/slice2cpp/msbuild/packages.config4
-rw-r--r--cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj8
-rw-r--r--cpp/src/slice2cs/msbuild/packages.config4
-rw-r--r--cpp/src/slice2cs/msbuild/slice2cs.vcxproj8
-rw-r--r--cpp/src/slice2html/msbuild/packages.config4
-rw-r--r--cpp/src/slice2html/msbuild/slice2html.vcxproj8
-rw-r--r--cpp/src/slice2java/msbuild/packages.config4
-rw-r--r--cpp/src/slice2java/msbuild/slice2java.vcxproj8
-rw-r--r--cpp/src/slice2js/msbuild/packages.config4
-rw-r--r--cpp/src/slice2js/msbuild/slice2js.vcxproj8
-rw-r--r--cpp/src/slice2php/msbuild/packages.config4
-rw-r--r--cpp/src/slice2php/msbuild/slice2php.vcxproj8
-rw-r--r--cpp/src/slice2py/msbuild/packages.config4
-rw-r--r--cpp/src/slice2py/msbuild/slice2py.vcxproj8
-rw-r--r--python/modules/IcePy/msbuild/icepy.vcxproj4
-rw-r--r--python/modules/IcePy/msbuild/packages.config2
-rwxr-xr-xscripts/TestUtil.py8
18 files changed, 57 insertions, 47 deletions
diff --git a/.gitignore b/.gitignore
index 056112907a8..04d49c352ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,9 @@ IceBuilder.d
xcuserdata
xcshareddata
/IceSDK
+
+# IceBuilder build log
+IceBuilder.command.*.log
+# Nuget packages
+**/msbuild/packages/*
+*.nupkg
diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config
index 88735dc0077..9a95568662e 100644
--- a/cpp/src/slice2cpp/msbuild/packages.config
+++ b/cpp/src/slice2cpp/msbuild/packages.config
@@ -1,5 +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" />
+ <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" 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 16a69b83a0b..def31fb939f 100644
--- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
+++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
@@ -118,14 +118,14 @@
</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')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\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.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'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2cs/msbuild/packages.config b/cpp/src/slice2cs/msbuild/packages.config
index 88735dc0077..9a95568662e 100644
--- a/cpp/src/slice2cs/msbuild/packages.config
+++ b/cpp/src/slice2cs/msbuild/packages.config
@@ -1,5 +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" />
+ <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" 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 7708db7883e..ec1e54df3b5 100644
--- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
+++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
@@ -126,14 +126,14 @@
</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')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\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'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2html/msbuild/packages.config b/cpp/src/slice2html/msbuild/packages.config
index 88735dc0077..9a95568662e 100644
--- a/cpp/src/slice2html/msbuild/packages.config
+++ b/cpp/src/slice2html/msbuild/packages.config
@@ -1,5 +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" />
+ <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" 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 3e833916756..65df2db4b93 100644
--- a/cpp/src/slice2html/msbuild/slice2html.vcxproj
+++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj
@@ -122,14 +122,14 @@
</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')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\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.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'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2java/msbuild/packages.config b/cpp/src/slice2java/msbuild/packages.config
index 88735dc0077..9a95568662e 100644
--- a/cpp/src/slice2java/msbuild/packages.config
+++ b/cpp/src/slice2java/msbuild/packages.config
@@ -1,5 +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" />
+ <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" 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 8ac04ba62e0..0b14eac0969 100644
--- a/cpp/src/slice2java/msbuild/slice2java.vcxproj
+++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj
@@ -123,14 +123,14 @@
</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')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\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'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2js/msbuild/packages.config b/cpp/src/slice2js/msbuild/packages.config
index 88735dc0077..9a95568662e 100644
--- a/cpp/src/slice2js/msbuild/packages.config
+++ b/cpp/src/slice2js/msbuild/packages.config
@@ -1,5 +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" />
+ <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" 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 c3b44bff5bc..c893cbbe059 100644
--- a/cpp/src/slice2js/msbuild/slice2js.vcxproj
+++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj
@@ -123,14 +123,14 @@
</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')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\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'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2php/msbuild/packages.config b/cpp/src/slice2php/msbuild/packages.config
index 88735dc0077..9a95568662e 100644
--- a/cpp/src/slice2php/msbuild/packages.config
+++ b/cpp/src/slice2php/msbuild/packages.config
@@ -1,5 +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" />
+ <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" 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 ea9211ecdea..8d1bfccf375 100644
--- a/cpp/src/slice2php/msbuild/slice2php.vcxproj
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -114,14 +114,14 @@
</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')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\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'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2py/msbuild/packages.config b/cpp/src/slice2py/msbuild/packages.config
index 88735dc0077..9a95568662e 100644
--- a/cpp/src/slice2py/msbuild/packages.config
+++ b/cpp/src/slice2py/msbuild/packages.config
@@ -1,5 +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" />
+ <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" 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 40ab0c9e81b..a396df33fe4 100644
--- a/cpp/src/slice2py/msbuild/slice2py.vcxproj
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -114,14 +114,14 @@
</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')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\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'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj b/python/modules/IcePy/msbuild/icepy.vcxproj
index b98115eae1d..b42ca3de1db 100644
--- a/python/modules/IcePy/msbuild/icepy.vcxproj
+++ b/python/modules/IcePy/msbuild/icepy.vcxproj
@@ -158,12 +158,12 @@
</ItemDefinitionGroup>
<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.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\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.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.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/python/modules/IcePy/msbuild/packages.config b/python/modules/IcePy/msbuild/packages.config
index 4b9db53e422..d590df9a87a 100644
--- a/python/modules/IcePy/msbuild/packages.config
+++ b/python/modules/IcePy/msbuild/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index f36b0698c3a..32a57da6d4d 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1887,10 +1887,14 @@ def getCppBinDir(lang = None):
return binDir
def getSliceTranslator(lang = "cpp"):
+ compiler = ""
if iceHome:
- return os.path.join(iceHome, "bin", "slice2%s" % lang)
+ compiler = os.path.join(iceHome, "bin", "slice2%s" % lang)
else:
- return os.path.join(getCppBinDir(), ("slice2%s" % lang))
+ compiler = os.path.join(getCppBinDir(), ("slice2%s" % lang))
+ if isWin32():
+ compiler += ".exe"
+ return compiler
def getCppLibDir(lang = None):
if isWin32():
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:27:29 +0000