diff options
20 files changed, 115 insertions, 128 deletions
diff --git a/cpp/BuildInstructionsWindows.md b/cpp/BuildInstructionsWindows.md index 4f85443e564..ec0cf9e9a2d 100644 --- a/cpp/BuildInstructionsWindows.md +++ b/cpp/BuildInstructionsWindows.md @@ -71,6 +71,10 @@ You can also skip the build of the test suite with the `BuildDist` target: msbuild msbuild\ice.proj /t:BuildDist /p:Platform=x64 +To build the test suite using the NuGet binary distribution use: + + msbuild msbuild\ice.proj /p:ICE_BIN_DIST=all + If you want to build all supported platforms and configurations at once, use: msbuild msbuild\ice.proj /p:BuildAllConfigurations=yes @@ -104,7 +108,7 @@ To build all configurations: msbuild msbuild\ice.proj /t:UWPBuildDist /p:BuildAllConfigurations=yes -To run the test suite without building the entire source base: +To build the test suite using the NuGet binary distribution use: msbuild msbuild\ice.proj /t:UWPBuild /p:ICE_BIN_DIST=all @@ -146,34 +150,23 @@ failure, the tests abort with `failed`. ## Running the Universal Windows Platform Test Suite -In Visual Studio 2015, open the solution file: - - cpp\msbuild\ice.testuwp.sln - -Now select the configuration that matches the settings that you used to build -Ice for UWP. - -To run the UWP Test suite application, you can deploy the application using "Deploy -Solution" in the "Build" menu. Once deployed, you can start the application from -the Start Menu by clicking the "Ice Test Suite" icon. +Python is required to run the test suite. Additionally, the Glacier2 tests +require the Python module `passlib`, which you can install with the command: -In the test suite application, selecting "uwp" for the Server field allows you -to run tests with TCP and WS protocols supported by the UWP server side. + pip install passlib -You can also use C++, C# or Java servers to run the tests, which allows you to -use additional SSL and WSS protocols. +The scripts also require Ice for Python, you can build Ice for Python from [python](../python) +folder of this source distribution or install the Python module `zeroc-ice`, using the +following command: -To use servers from C++, C# or Java language mappings, you need to build the -tests for the desired language mapping. + pip install zeroc-ice -The test controller server is implemented in Java. Refer to the build -instructions in the java subdirectory for information on building the test -controller. Use the following command to start the test controller: +You can run the testsuite from the console using python: - python scripts/TestController.py + python allTest.py --uwp --controller-app --platform x64 --config Release -In the "Ice Test Suite" Windows Store application, select the Server language -mapping and Protocol you want to use. +If everything worked out, you should see lots of `ok` messages. In case of a +failure, the tests abort with `failed`. [1]: https://zeroc.com/distributions/ice [2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.0 diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config index 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2cpp/msbuild/packages.config +++ b/cpp/src/slice2cpp/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" 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 0d59ebe7ab0..a42ad76d251 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj @@ -124,19 +124,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.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 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2cs/msbuild/packages.config +++ b/cpp/src/slice2cs/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" 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 de6839f93da..0b4e88298eb 100644 --- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj +++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj @@ -132,19 +132,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.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 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2html/msbuild/packages.config +++ b/cpp/src/slice2html/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" 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 00f1bd5ffbd..001812589db 100644 --- a/cpp/src/slice2html/msbuild/slice2html.vcxproj +++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj @@ -128,19 +128,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.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 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2java/msbuild/packages.config +++ b/cpp/src/slice2java/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" 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 e810291fe31..102c618f7c3 100644 --- a/cpp/src/slice2java/msbuild/slice2java.vcxproj +++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj @@ -129,19 +129,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.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 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2js/msbuild/packages.config +++ b/cpp/src/slice2js/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" 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 70fd4080272..96da9fffa61 100644 --- a/cpp/src/slice2js/msbuild/slice2js.vcxproj +++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj @@ -129,19 +129,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2objc/msbuild/packages.config b/cpp/src/slice2objc/msbuild/packages.config index 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2objc/msbuild/packages.config +++ b/cpp/src/slice2objc/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj index 72fbed14f49..748d83341b5 100644 --- a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj +++ b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj @@ -129,19 +129,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj index 2cafb8a2472..cd73b48a7d5 100644 --- a/cpp/src/slice2php/msbuild/slice2php.vcxproj +++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj @@ -121,9 +121,6 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> @@ -131,8 +128,5 @@ <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.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 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2py/msbuild/packages.config +++ b/cpp/src/slice2py/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" 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 912f7a5dbe1..81abcd98368 100644 --- a/cpp/src/slice2py/msbuild/slice2py.vcxproj +++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj @@ -120,19 +120,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2rb/msbuild/packages.config b/cpp/src/slice2rb/msbuild/packages.config index 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2rb/msbuild/packages.config +++ b/cpp/src/slice2rb/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj index d724dbe42a0..a832210a0bb 100644 --- a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj +++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj @@ -119,19 +119,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <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.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.16\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.16\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.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 985397d1810..760d6118431 100644 --- a/python/modules/IcePy/msbuild/icepy.vcxproj +++ b/python/modules/IcePy/msbuild/icepy.vcxproj @@ -177,12 +177,12 @@ </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\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.16\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.16\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\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 b157755c2b9..e5ba87549f9 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.16" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> </packages>
\ No newline at end of file |