Skip to content

Commit

Permalink
#288, kind of: Enabled package restore. I didn't do anything here man…
Browse files Browse the repository at this point in the history
…ually actually (or if I did, it was at least not today :-) Could be a difference with VS2012 and 2013 I guess.
  • Loading branch information
perlun committed Mar 28, 2014
1 parent d3a1f1d commit 71ec685
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion CefSharp.Core/CefSharp.Core.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<ProjectGuid>{7B495581-2271-4F41-9476-ACB86E8C864F}</ProjectGuid>
<RootNamespace>CefSharp</RootNamespace>
<Keyword>ManagedCProj</Keyword>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(SolutionDir)\CefSharp.props" />
Expand Down Expand Up @@ -270,11 +272,14 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props'))" />
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
</Project>

2 comments on commit 71ec685

@jornh
Copy link
Contributor

@jornh jornh commented on 71ec685 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perlun is this "the old way" compared the the new suggested way: http://blog.davidebbo.com/2014/01/the-right-way-to-restore-nuget-packages.html or is it something different?

@perlun
Copy link
Member Author

@perlun perlun commented on 71ec685 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. This changeset is evil. I will revert it. (Well, actually, if you don't know why a file has been changed, there's a quite good chance you shouldn't actually be comitting it... 😉)

This relates to the problem @JanEggers was reporting in #137. I saw you already fixed it in 50615de - good!

Please sign in to comment.