diff options
| author | Jose <jose@zeroc.com> | 2017-06-13 19:26:15 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-13 19:26:15 +0200 |
| commit | d662c912e253270c0f2d83ac779a67efc191d7b2 (patch) | |
| tree | e34b4c7f00e1a9d84750ad87335fcbaa3f9a9895 /cpp/src/slice2objc | |
| parent | Fixed for ICE-8012 - heartbeatCallback non null assert (diff) | |
| download | ice-d662c912e253270c0f2d83ac779a67efc191d7b2.tar.bz2 ice-d662c912e253270c0f2d83ac779a67efc191d7b2.tar.xz ice-d662c912e253270c0f2d83ac779a67efc191d7b2.zip | |
Update mcpp/lmdb NuGet packages
Diffstat (limited to 'cpp/src/slice2objc')
| -rw-r--r-- | cpp/src/slice2objc/msbuild/packages.config | 8 | ||||
| -rw-r--r-- | cpp/src/slice2objc/msbuild/slice2objc.vcxproj | 16 | ||||
| -rw-r--r-- | cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/cpp/src/slice2objc/msbuild/packages.config b/cpp/src/slice2objc/msbuild/packages.config index ac1cf9f8ab9..3fe9fdfb8fc 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.14" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.14" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.14" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.14" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.15" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.15" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.15" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.15" 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 68d0d22a578..c6bd84d9682 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.14\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.14\build\native\mcpp.v100.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.14\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.14\build\native\mcpp.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.14\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.14\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.14\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.14\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.15\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.15\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.15\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.15\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.15\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.15\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.15\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.15\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.14\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.14\build\native\mcpp.v100.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.14\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.14\build\native\mcpp.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.14\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.14\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.14\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.14\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.15\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.15\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.15\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.15\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.15\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.15\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.15\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.15\build\native\mcpp.v141.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters index 05c7cb1a564..451f680ab7a 100644 --- a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters +++ b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters @@ -34,11 +34,11 @@ </ClInclude> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\Slice2Objc.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> </Project>
\ No newline at end of file |