diff options
| author | Jose <jose@zeroc.com> | 2016-11-11 22:20:34 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-11-11 22:20:34 +0100 |
| commit | c571269c236e80d32dcd1c13259bf7a5680a6abc (patch) | |
| tree | a8ac7f38361beaa5d30bbe84de27ea0dda282395 /cpp/src/slice2cs | |
| parent | Update to mcpp-2.7.2.12 (diff) | |
| download | ice-c571269c236e80d32dcd1c13259bf7a5680a6abc.tar.bz2 ice-c571269c236e80d32dcd1c13259bf7a5680a6abc.tar.xz ice-c571269c236e80d32dcd1c13259bf7a5680a6abc.zip | |
MSBuild project updates
- Update Mcpp dependencies to 2.7.2.12
- Update msbuild projects to latest Ice Builder 4.3.5
Diffstat (limited to 'cpp/src/slice2cs')
| -rw-r--r-- | cpp/src/slice2cs/msbuild/packages.config | 4 | ||||
| -rw-r--r-- | cpp/src/slice2cs/msbuild/slice2cs.vcxproj | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2cs/msbuild/packages.config b/cpp/src/slice2cs/msbuild/packages.config index 2d6f1c8ced3..597bcabd211 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.11" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.12" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.12" 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 f65f6eb46a4..c3335d43424 100644 --- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj +++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj @@ -130,15 +130,15 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" /> + <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')" /> </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.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" /> + <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'))" /> </Target> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> </Project>
\ No newline at end of file |