Skip to content

Commit 04b6419

Browse files
amaitlandamaitland
committed
Nuget - Revert back to the 63 package props/targets files
The newer changes aren't complete - missing at least the BrowserSubprocess, so going with what's been tested for now. Will fix in `master`
1 parent 810f087 commit 04b6419

11 files changed

+194
-133
lines changed

‎NuGet/CefSharp.Common.props‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
5-
<CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
6-
</ItemGroup>
7-
8-
<PropertyGroup>
9-
<CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
10-
</PropertyGroup>
11-
123
<Choose>
13-
<When Condition="'$(Platform)' == 'AnyCPU'">
14-
<ItemGroup>
15-
<Reference Include="CefSharp">
16-
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.dll</HintPath>
17-
<Private>False</Private>
18-
</Reference>
19-
<Reference Include="CefSharp.Core">
20-
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Core.dll</HintPath>
21-
<Private>False</Private>
22-
</Reference>
23-
<!--
24-
We include CefSharp and CefSharp.Core as private false then copy the files using a
25-
None entry. The 32bit libs must be included first or VS will use the x64
26-
ones for the VS Designer.
27-
-->
28-
<None Include="@(CefSharpCommonBinaries32)">
29-
<Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
30-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31-
</None>
32-
<None Include="@(CefSharpCommonBinaries64)">
33-
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
34-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35-
</None>
36-
</ItemGroup>
37-
</When>
384
<When Condition="'$(Platform)' == 'x64'">
395
<ItemGroup>
406
<Reference Include="CefSharp">

‎NuGet/CefSharp.Common.targets‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
<Error Text="CefSharp requires .Net 4.5.2 or higher" />
99
</Target>
1010

11+
<ItemGroup>
12+
<CefSharpCommonBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
13+
<CefSharpCommonBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
14+
<CefSharpCommonBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
15+
</ItemGroup>
16+
17+
<PropertyGroup>
18+
<CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
19+
</PropertyGroup>
20+
1121
<!--
1222
These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
1323
correct ordering .props imports, which we require as this depends on the cef.redist packages
@@ -19,13 +29,21 @@
1929
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
2030
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2131
</None>
32+
<None Include="@(CefSharpCommonBinaries32)">
33+
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
34+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35+
</None>
2236
</ItemGroup>
2337

2438
<ItemGroup Condition="'$(Platform)' == 'x64'">
2539
<None Include="@(CefRedist64)">
2640
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
2741
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2842
</None>
43+
<None Include="@(CefSharpCommonBinaries64)">
44+
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
45+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
46+
</None>
2947
</ItemGroup>
3048

3149
<ItemGroup Condition="'$(Platform)' == 'AnyCPU'">
@@ -37,5 +55,13 @@
3755
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
3856
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3957
</None>
58+
<None Include="@(CefSharpCommonBinaries32)">
59+
<Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
60+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
61+
</None>
62+
<None Include="@(CefSharpCommonBinaries64)">
63+
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
64+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
65+
</None>
4066
</ItemGroup>
4167
</Project>

‎NuGet/CefSharp.OffScreen.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<file src="..\CefSharp.OffScreen\bin\x64\Release\CefSharp.OffScreen.pdb" target="CefSharp\x64" />
3636

3737
<file src="CefSharp.OffScreen.props" target="build" />
38+
<file src="CefSharp.OffScreen.targets" target="build" />
3839

3940
<file src="Readme.txt" target="" />
4041

‎NuGet/CefSharp.OffScreen.props‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
5-
</PropertyGroup>
6-
7-
<ItemGroup>
8-
<CefSharpOffScreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
9-
<CefSharpOffScreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
10-
</ItemGroup>
11-
123
<Choose>
13-
<When Condition="'$(Platform)' == 'AnyCPU'">
14-
<ItemGroup>
15-
<Reference Include="CefSharp.OffScreen">
16-
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.OffScreen.dll</HintPath>
17-
<Private>False</Private>
18-
</Reference>
19-
<!--
20-
We include CefSharp.OffScreen as private false then copy the files using a
21-
None entry. The 32bit libs are included first for consistency with the WinForms
22-
and WPF versions which is required by the VS Designer.
23-
-->
24-
<None Include="@(CefSharpOffScreenBinaries32)">
25-
<Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
26-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
</None>
28-
<None Include="@(CefSharpOffScreenBinaries64)">
29-
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
30-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31-
</None>
32-
</ItemGroup>
33-
</When>
344
<When Condition="'$(Platform)' == 'x64'">
355
<ItemGroup>
366
<Reference Include="CefSharp.OffScreen">
377
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.OffScreen.dll</HintPath>
38-
<Private>True</Private>
8+
<Private>False</Private>
399
</Reference>
4010
</ItemGroup>
4111
</When>
42-
<!-- x86 and Win32 -->
12+
<!-- x86, Win32 and AnyCPU -->
4313
<Otherwise>
4414
<ItemGroup>
4515
<Reference Include="CefSharp.OffScreen">
4616
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.OffScreen.dll</HintPath>
47-
<Private>True</Private>
17+
<Private>False</Private>
4818
</Reference>
4919
</ItemGroup>
5020
</Otherwise>

‎NuGet/CefSharp.OffScreen.targets‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<CefSharpOffScreenBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
9+
<CefSharpOffScreenBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
10+
<!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
11+
<CefSharpOffscreenBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
12+
</ItemGroup>
13+
14+
<!--
15+
These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
16+
correct ordering .props imports, which we require as this depends on the cef.redist packages
17+
exporting an ItemGroup
18+
-->
19+
20+
<!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
21+
<Choose>
22+
<When Condition="'$(Platform)' == 'AnyCPU'">
23+
<ItemGroup>
24+
<None Include="@(CefSharpOffScreenBinaries32)">
25+
<Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
</None>
28+
<None Include="@(CefSharpOffScreenBinaries64)">
29+
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
30+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
</None>
32+
</ItemGroup>
33+
</When>
34+
<When Condition="'$(Platform)' == 'x64'">
35+
<ItemGroup>
36+
<None Include="@(CefSharpOffScreenBinaries64)">
37+
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
38+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39+
</None>
40+
</ItemGroup>
41+
</When>
42+
<!-- x86, and Win32 -->
43+
<Otherwise>
44+
<ItemGroup>
45+
<None Include="@(CefSharpOffScreenBinaries32)">
46+
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
47+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
48+
</None>
49+
</ItemGroup>
50+
</Otherwise>
51+
</Choose>
52+
</Project>

‎NuGet/CefSharp.WinForms.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<file src="..\CefSharp.WinForms\bin\x64\Release\CefSharp.WinForms.pdb" target="CefSharp\x64" />
3636

3737
<file src="CefSharp.WinForms.props" target="build" />
38+
<file src="CefSharp.WinForms.targets" target="build" />
3839

3940
<file src="Readme.txt" target="" />
4041

‎NuGet/CefSharp.WinForms.props‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
5-
</PropertyGroup>
6-
7-
<ItemGroup>
8-
<CefSharpWinFormsBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
9-
<CefSharpWinFormsBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
10-
</ItemGroup>
11-
123
<Choose>
13-
<When Condition="'$(Platform)' == 'AnyCPU'">
14-
<ItemGroup>
15-
<Reference Include="CefSharp.WinForms">
16-
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.WinForms.dll</HintPath>
17-
<Private>False</Private>
18-
</Reference>
19-
<!--
20-
We include CefSharp.WinForms as private false then copy the files using a
21-
None entry. The 32bit libs must be included first or VS will use the x64
22-
ones for the VS Designer.
23-
-->
24-
<None Include="@(CefSharpWinFormsBinaries32)">
25-
<Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
26-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
</None>
28-
<None Include="@(CefSharpWinFormsBinaries64)">
29-
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
30-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31-
</None>
32-
</ItemGroup>
33-
</When>
344
<When Condition="'$(Platform)' == 'x64'">
355
<ItemGroup>
366
<Reference Include="CefSharp.WinForms">
377
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.WinForms.dll</HintPath>
38-
<Private>True</Private>
8+
<Private>False</Private>
399
</Reference>
4010
</ItemGroup>
4111
</When>
42-
<!-- x86 and Win32 -->
12+
<!-- x86, Win32 and AnyCPU -->
4313
<Otherwise>
4414
<ItemGroup>
4515
<Reference Include="CefSharp.WinForms">
4616
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.WinForms.dll</HintPath>
47-
<Private>True</Private>
17+
<Private>False</Private>
4818
</Reference>
4919
</ItemGroup>
5020
</Otherwise>

‎NuGet/CefSharp.WinForms.targets‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<CefSharpWinFormsBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
9+
<CefSharpWinFormsBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
10+
<!-- Not currently used, might come in handy for someone though as it contains all x86 and x64 files -->
11+
<CefSharpWinFormsBinariesAnyCPU Include="$(MSBuildThisFileDirectory)..\CefSharp\**\*.*" />
12+
</ItemGroup>
13+
14+
<!--
15+
These item groups should be in the .props file, unfortunately Nuget 2.8.x doesn't gurantee the
16+
correct ordering .props imports, which we require as this depends on the cef.redist packages
17+
exporting an ItemGroup
18+
-->
19+
20+
<!-- Copying all files here included those at are added As References so you can specify CefSharpTargetDir -->
21+
<Choose>
22+
<When Condition="'$(Platform)' == 'AnyCPU'">
23+
<ItemGroup>
24+
<None Include="@(CefSharpWinFormsBinaries32)">
25+
<Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
</None>
28+
<None Include="@(CefSharpWinFormsBinaries64)">
29+
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
30+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
</None>
32+
</ItemGroup>
33+
</When>
34+
<When Condition="'$(Platform)' == 'x64'">
35+
<ItemGroup>
36+
<None Include="@(CefSharpWinFormsBinaries64)">
37+
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
38+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39+
</None>
40+
</ItemGroup>
41+
</When>
42+
<!-- x86, and Win32 -->
43+
<Otherwise>
44+
<ItemGroup>
45+
<None Include="@(CefSharpWinFormsBinaries32)">
46+
<Link>$(CefSharpTargetDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
47+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
48+
</None>
49+
</ItemGroup>
50+
</Otherwise>
51+
</Choose>
52+
</Project>

‎NuGet/CefSharp.Wpf.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.pdb" target="CefSharp\x64" />
3636

3737
<file src="CefSharp.Wpf.props" target="build" />
38+
<file src="CefSharp.Wpf.targets" target="build" />
3839

3940
<file src="Readme.txt" target="" />
4041

‎NuGet/CefSharp.Wpf.props‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<CefSharpTargetDir Condition=" '$(CefSharpTargetDir)' == '' "></CefSharpTargetDir>
5-
</PropertyGroup>
6-
7-
<ItemGroup>
8-
<CefSharpWpfBinaries32 Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\*.*" />
9-
<CefSharpWpfBinaries64 Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\*.*" />
10-
</ItemGroup>
11-
123
<Choose>
13-
<When Condition="'$(Platform)' == 'AnyCPU'">
14-
<ItemGroup>
15-
<Reference Include="CefSharp.Wpf">
16-
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll</HintPath>
17-
<Private>False</Private>
18-
</Reference>
19-
<!--
20-
We include CefSharp.Wpf as private false then copy the files using a
21-
None entry. The 32bit libs must be included first or VS will use the x64
22-
ones for the VS Designer.
23-
-->
24-
<None Include="@(CefSharpWpfBinaries32)">
25-
<Link>$(CefSharpTargetDir)\x86\%(RecursiveDir)%(FileName)%(Extension)</Link>
26-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
</None>
28-
<None Include="@(CefSharpWpfBinaries64)">
29-
<Link>$(CefSharpTargetDir)\x64\%(RecursiveDir)%(FileName)%(Extension)</Link>
30-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31-
</None>
32-
</ItemGroup>
33-
</When>
344
<When Condition="'$(Platform)' == 'x64'">
355
<ItemGroup>
366
<Reference Include="CefSharp.Wpf">
377
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Wpf.dll</HintPath>
38-
<Private>True</Private>
8+
<Private>False</Private>
399
</Reference>
4010
</ItemGroup>
4111
</When>
42-
<!-- x86 and Win32 -->
12+
<!-- x86, Win32 and AnyCPU -->
4313
<Otherwise>
4414
<ItemGroup>
4515
<Reference Include="CefSharp.Wpf">
4616
<HintPath>$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll</HintPath>
47-
<Private>True</Private>
17+
<Private>False</Private>
4818
</Reference>
4919
</ItemGroup>
5020
</Otherwise>

0 commit comments

Comments
 (0)