Skip to content

Commit d93ff62

Browse files
perlunperlun
committed
Work towards #137.
1 parent c6f001c commit d93ff62

File tree

5 files changed

+74
-28
lines changed

5 files changed

+74
-28
lines changed

‎CefSharp3.sln‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ EndProject
1717
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47D0DC8C-D707-4D8A-A578-7737AA9CE79B}"
1818
ProjectSection(SolutionItems) = preProject
1919
CefSharp.props = CefSharp.props
20-
NuGet\CefSharp.Wpf.nuspec = NuGet\CefSharp.Wpf.nuspec
2120
ChangeLog.md = ChangeLog.md
2221
LICENSE = LICENSE
2322
README.md = README.md
@@ -34,6 +33,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.WinForms", "CefSha
3433
EndProject
3534
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.WinForms.Example", "CefSharp.WinForms.Example\CefSharp.WinForms.Example.csproj", "{C043FFF7-5F71-4FFC-989A-E09E18548589}"
3635
EndProject
36+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{A23AA466-1903-44F2-946D-25AD0500D56B}"
37+
ProjectSection(SolutionItems) = preProject
38+
NuGet\CefSharp.Core.nuspec = NuGet\CefSharp.Core.nuspec
39+
NuGet\CefSharp.Core.props = NuGet\CefSharp.Core.props
40+
NuGet\CefSharp.Core.targets = NuGet\CefSharp.Core.targets
41+
NuGet\CefSharp.DevTools.nuspec = NuGet\CefSharp.DevTools.nuspec
42+
NuGet\CefSharp.Locales.nuspec = NuGet\CefSharp.Locales.nuspec
43+
NuGet\CefSharp.Multimedia.nuspec = NuGet\CefSharp.Multimedia.nuspec
44+
NuGet\CefSharp.WinForms.nuspec = NuGet\CefSharp.WinForms.nuspec
45+
NuGet\CefSharp.Wpf.nuspec = NuGet\CefSharp.Wpf.nuspec
46+
NuGet\CefSharp.Wpf.props = NuGet\CefSharp.Wpf.props
47+
NuGet\pack.bat = NuGet\pack.bat
48+
EndProjectSection
49+
EndProject
3750
Global
3851
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3952
Debug|Win32 = Debug|Win32
@@ -110,4 +123,7 @@ Global
110123
GlobalSection(SolutionProperties) = preSolution
111124
HideSolutionNode = FALSE
112125
EndGlobalSection
126+
GlobalSection(NestedProjects) = preSolution
127+
{A23AA466-1903-44F2-946D-25AD0500D56B} = {47D0DC8C-D707-4D8A-A578-7737AA9CE79B}
128+
EndGlobalSection
113129
EndGlobal

‎NuGet/CefSharp.Core.nuspec‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>CefSharp.Core</id>
5+
<version>$version$</version>
6+
<authors>The CefSharp Authors</authors>
7+
<owners>The CefSharp Authors</owners>
8+
<projectUrl>https://github.com/cefsharp/cefsharp</projectUrl>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<description>The CefSharp Chromium-based browser component (Core components, needed by both WPF and WinForms).</description>
11+
<tags>chrome browser</tags>
12+
<copyright>Copyright © 2010-2013 The CefSharp Authors</copyright>
13+
</metadata>
14+
<files>
15+
<!-- CEF/Chromium files -->
16+
<file src="..\CEF\Win32\icudt.dll" target="CEF\x86" />
17+
<file src="..\CEF\x64\icudt.dll" target="CEF\x64" />
18+
<file src="..\CEF\Win32\libcef.dll" target="CEF\x86"/>
19+
<file src="..\CEF\x64\libcef.dll" target="CEF\x64"/>
20+
<file src="..\CEF\locales\en-US.pak" target="CEF\locales"/>
21+
22+
<!-- Common CefSharp stuff (shared between both WPF and WinForms) -->
23+
<file src="..\Win32\Release\CefSharp.dll" target="CefSharp\x86"/>
24+
<file src="..\x64\Release\CefSharp.dll" target="CefSharp\x64"/>
25+
<file src="..\CefSharp.BrowserSubprocess\bin\x86\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x86"/>
26+
<file src="..\CefSharp.BrowserSubprocess\bin\x64\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x64"/>
27+
28+
<file src="CefSharp.Core.props" target="build" />
29+
<file src="CefSharp.Core.targets" target="build" />
30+
</files>
31+
</package>

‎NuGet/CefSharp.Wpf.nuspec‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,23 @@
33
<metadata>
44
<id>CefSharp.Wpf</id>
55
<version>$version$</version>
6-
<authors>CefSharp community</authors>
7-
<owners>CefSharp community</owners>
8-
<projectUrl>https://github.com/perlun/cefsharp</projectUrl>
6+
<authors>The CefSharp Authors</authors>
7+
<owners>The CefSharp Authors</owners>
8+
<projectUrl>https://github.com/cefsharp/cefsharp</projectUrl>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10-
<description>The CefSharp Chromium-based browser component (WPF version).</description>
10+
<description>The CefSharp Chromium-based browser component (WPF control).</description>
1111
<tags>wpf chrome browser</tags>
12-
<copyright>Copyright © 2013 Per Lundberg, Anthony Taranto and others</copyright>
13-
<frameworkAssemblies>
14-
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" />
15-
<frameworkAssembly assemblyName="System.Windows.Browser" targetFramework="sl50" />
16-
<frameworkAssembly assemblyName="System.Windows.Controls" targetFramework="sl50" />
17-
<frameworkAssembly assemblyName="System.Windows.Controls.Navigation" targetFramework="sl50" />
18-
</frameworkAssemblies>
12+
<copyright>Copyright © 2010-2013 The CefSharp Authors</copyright>
13+
<dependencies>
14+
<dependency id="CefSharp.Core" version="[$version$]" />
15+
</dependencies>
1916
</metadata>
2017
<files>
21-
<!-- CefSharp files -->
22-
<file src="..\Release\CefSharp.dll" target="lib\net40"/>
23-
<file src="..\Release\CefSharp.Wpf.dll" target="lib\net40"/>
18+
<!-- Cannot put these inside lib\net40 etc, since there are both x86 and x64 versions which we must distinguish between. We
19+
solve this using a .props file instead. -->
20+
<file src="..\CefSharp.Wpf\bin\x86\Release\CefSharp.Wpf.dll" target="CefSharp\x86" />
21+
<file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.dll" target="CefSharp\x64" />
2422

25-
<!-- CEF/Chromium files -->
26-
<file src="..\Release\avcodec-54.dll" target="content\bin\Debug"/>
27-
<file src="..\Release\avformat-54.dll" target="content\bin\Debug"/>
28-
<file src="..\Release\avutil-51.dll" target="content\bin\Debug"/>
29-
<file src="..\Release\icudt.dll" target="content\bin\Debug"/>
30-
<file src="..\Release\libcef.dll" target="content\bin\Debug"/>
31-
<file src="..\Release\libcef.dll" target="content\bin\Debug"/>
32-
<file src="..\Release\libEGL.dll" target="content\bin\Debug"/>
33-
<file src="..\Release\libGLESv2.dll" target="content\bin\Debug"/>
34-
<file src="..\Release\devtools_resources.pak" target="content\bin\Debug\devtools_resources.pak"/>
35-
36-
<!-- Only including en-US for now -->
37-
<file src="..\Release\locales\en-US.pak" target="content\bin\Debug\locales"/>
23+
<file src="CefSharp.Wpf.props" target="build" />
3824
</files>
3925
</package>

‎NuGet/CefSharp.Wpf.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Reference Condition="'$(Platform)' == 'x86'"
5+
Include="$(MSBuildThisFileDirectory)..\CefSharp\x86\CefSharp.Wpf.dll" />
6+
7+
<Reference Condition="'$(Platform)' == 'x64'"
8+
Include="$(MSBuildThisFileDirectory)..\CefSharp\x64\CefSharp.Wpf.dll" />
9+
</ItemGroup>
10+
</Project>

‎NuGet/pack.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set version=3.29.0-pre0
2+
NuGet pack CefSharp.Core.nuspec -NoPackageAnalysis -Version %version%
3+
NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version%

0 commit comments

Comments
 (0)