diff options
| author | Jose <jose@zeroc.com> | 2017-06-12 13:51:02 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-12 13:51:02 +0200 |
| commit | 9708d6d9103b0dab4afae4af72031ab08278910b (patch) | |
| tree | 3f390da30bb46736577628d9ff2152087dae387e /cpp/src/slice2js | |
| parent | Fix IceNugetPackageVersion in zeroc.ice.net package (diff) | |
| download | ice-9708d6d9103b0dab4afae4af72031ab08278910b.tar.bz2 ice-9708d6d9103b0dab4afae4af72031ab08278910b.tar.xz ice-9708d6d9103b0dab4afae4af72031ab08278910b.zip | |
Update NuGet package versions
Diffstat (limited to 'cpp/src/slice2js')
| -rw-r--r-- | cpp/src/slice2js/msbuild/packages.config | 8 | ||||
| -rw-r--r-- | cpp/src/slice2js/msbuild/slice2js.vcxproj | 24 |
2 files changed, 16 insertions, 16 deletions
diff --git a/cpp/src/slice2js/msbuild/packages.config b/cpp/src/slice2js/msbuild/packages.config index 06d81257299..ac1cf9f8ab9 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.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" /> + <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" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj index 8fc3232d6ec..0d827c07b7b 100644 --- a/cpp/src/slice2js/msbuild/slice2js.vcxproj +++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj @@ -117,9 +117,6 @@ <ClInclude Include="..\JsUtil.h" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj"> <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project> </ProjectReference> @@ -127,21 +124,24 @@ <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <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')" /> + <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')" /> </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.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'))" /> + <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'))" /> </Target> - <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> </Project>
\ No newline at end of file |