Skip to content

Commit

Permalink
Nuget - Fix casing of AnyCPU (was previously AnyCpu)
Browse files Browse the repository at this point in the history
Related to #2276
  • Loading branch information
amaitland committed Mar 5, 2018
1 parent 38663e3 commit c1255e8
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion NuGet/CefSharp.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</Reference>
</ItemGroup>
</When>
<!-- x86, Win32 and AnyCpu -->
<!-- x86, Win32 and AnyCPU -->
<Otherwise>
<ItemGroup>
<Reference Include="CefSharp">
Expand Down
4 changes: 2 additions & 2 deletions NuGet/CefSharp.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
<CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
<CefSharpCommonBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
<CefSharpCommonBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
</ItemGroup>

<PropertyGroup>
Expand Down Expand Up @@ -55,7 +55,7 @@
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="@(CefSharpCommonBinariesAnyCpu)">
<None Include="@(CefSharpCommonBinariesAnyCPU)">
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
2 changes: 1 addition & 1 deletion NuGet/CefSharp.OffScreen.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</Reference>
</ItemGroup>
</When>
<!-- x86, Win32 and AnyCpu -->
<!-- x86, Win32 and AnyCPU -->
<Otherwise>
<ItemGroup>
<Reference Include="CefSharp.OffScreen">
Expand Down
6 changes: 3 additions & 3 deletions NuGet/CefSharp.OffScreen.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<CefSharpOffScreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
<CefSharpOffScreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
<!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
<CefSharpOffscreenBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
<CefSharpOffscreenBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
</ItemGroup>

<!--
Expand All @@ -19,9 +19,9 @@

<!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
<Choose>
<When Condition="'$(Platform)' == 'AnyCpu'">
<When Condition="'$(Platform)' == 'AnyCPU'">
<ItemGroup>
<None Include="@(CefSharpOffscreenBinariesAnyCpu)">
<None Include="@(CefSharpOffscreenBinariesAnyCPU)">
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
2 changes: 1 addition & 1 deletion NuGet/CefSharp.WinForms.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</Reference>
</ItemGroup>
</When>
<!-- x86, Win32 and AnyCpu -->
<!-- x86, Win32 and AnyCPU -->
<Otherwise>
<ItemGroup>
<Reference Include="CefSharp.WinForms">
Expand Down
6 changes: 3 additions & 3 deletions NuGet/CefSharp.WinForms.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<CefSharpWinFormsBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
<CefSharpWinFormsBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
<!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
<CefSharpWinFormsBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
<CefSharpWinFormsBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
</ItemGroup>

<!--
Expand All @@ -19,9 +19,9 @@

<!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
<Choose>
<When Condition="'$(Platform)' == 'AnyCpu'">
<When Condition="'$(Platform)' == 'AnyCPU'">
<ItemGroup>
<None Include="@(CefSharpWinFormsBinariesAnyCpu)">
<None Include="@(CefSharpWinFormsBinariesAnyCPU)">
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
2 changes: 1 addition & 1 deletion NuGet/CefSharp.Wpf.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</Reference>
</ItemGroup>
</When>
<!-- x86, Win32 and AnyCpu -->
<!-- x86, Win32 and AnyCPU -->
<Otherwise>
<ItemGroup>
<Reference Include="CefSharp.Wpf">
Expand Down
6 changes: 3 additions & 3 deletions NuGet/CefSharp.Wpf.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<CefSharpWpfBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
<CefSharpWpfBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
<!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
<CefSharpWpfBinariesAnyCpu Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
<CefSharpWpfBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
</ItemGroup>

<!--
Expand All @@ -19,9 +19,9 @@

<!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
<Choose>
<When Condition="'$(Platform)' == 'AnyCpu'">
<When Condition="'$(Platform)' == 'AnyCPU'">
<ItemGroup>
<None Include="@(CefSharpWpfBinariesAnyCpu)">
<None Include="@(CefSharpWpfBinariesAnyCPU)">
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
2 changes: 1 addition & 1 deletion NuGet/Readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Background:

Post Installation:
- Read the release notes for your version https://github.com/cefsharp/CefSharp/releases (Any known issues will be listed here)
- Set either `x86` or x64` as your target architecture (See https://msdn.microsoft.com/en-us/library/ms185328.aspx#Anchor_0 for details). `AnyCpu` support in versions > `51.0.0`, please see the release notes for details as additional steps are required to make it work.
- Set either `x86` or x64` as your target architecture (See https://msdn.microsoft.com/en-us/library/ms185328.aspx#Anchor_0 for details). `AnyCPU` support in versions > `51.0.0`, please see the release notes for details as additional steps are required to make it work.
- After installing the `Nuget` package we recommend closing Visual Studio completely and then reopening (This ensures your references show up and you have full intellisense).
- Check your output `\bin` directory to make sure the appropriate references have been copied.
- Build fails even though packages are installed. Short term rebuild again and everything should be find. Long term we recommend reading http://www.xavierdecoster.com/migrate-away-from-msbuild-based-nuget-package-restore
Expand Down

0 comments on commit c1255e8

Please sign in to comment.